From 22f2171b2f5a5cd594ea027860207bf3646f1f9d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 05 二月 2024 14:08:14 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
index a7cdde5..9266c9a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
@@ -44,7 +44,7 @@
//@PreAuthorize("@ss.hasPermi('project:organization:list')")
@GetMapping("/list")
public TableDataInfo list(BaseOrganization baseOrganization) {
- log.info("鑾峰彇鏈烘瀯鍒楄〃{}锛�" , baseOrganization);
+ log.info("鑾峰彇鏈烘瀯鍒楄〃{}锛�", baseOrganization);
startPage();
List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
return getDataTable(list);
@@ -58,7 +58,7 @@
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(BaseOrganization baseOrganization) {
- log.info("瀵煎嚭鏈烘瀯淇℃伅{}锛�" , baseOrganization);
+ log.info("瀵煎嚭鏈烘瀯淇℃伅{}锛�", baseOrganization);
List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
ExcelUtil<BaseOrganization> util = new ExcelUtil<BaseOrganization>(BaseOrganization.class);
return util.exportExcel(list, "鏈烘瀯绠＄悊鏁版嵁");
@@ -71,7 +71,7 @@
//@PreAuthorize("@ss.hasPermi('project:organization:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
- log.info("鑾峰彇鏈烘瀯绠＄悊璇︾粏淇℃伅{}锛�" , id);
+ log.info("鑾峰彇鏈烘瀯绠＄悊璇︾粏淇℃伅{}锛�", id);
return AjaxResult.success(baseOrganizationService.getById(id));
}
@@ -81,14 +81,17 @@
@ApiOperation("鏂板鏈烘瀯淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:organization:add')")
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody BaseOrganization baseOrganization) {
- log.info("鏂板鏈烘瀯淇℃伅{}锛�" , baseOrganization);
+ log.info("鏂板鏈烘瀯淇℃伅{}锛�", baseOrganization);
String organization = onlyValueCommon.addOnlyValue("organization");
//"0"+鍦板競缂栫爜+鍖婚櫌绫诲瀷+搴忓彿
baseOrganization.setOrganizationid("0" + baseOrganization.getRegionallevel() + baseOrganization.getHospitalnature() + organization);
- return toAjax(baseOrganizationService.save(baseOrganization));
+
+ boolean save = baseOrganizationService.save(baseOrganization);
+ log.info("鏂板鏈烘瀯淇℃伅baseOrganization鐨処D{}锛�", baseOrganization.getId());
+ return AjaxResult.success(baseOrganization);
}
/**
@@ -100,7 +103,7 @@
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody BaseOrganization baseOrganization) {
- log.info("淇敼鏈烘瀯淇℃伅{}锛�" , baseOrganization);
+ log.info("淇敼鏈烘瀯淇℃伅{}锛�", baseOrganization);
return toAjax(baseOrganizationService.updateById(baseOrganization));
}
@@ -112,7 +115,7 @@
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
- log.info("鍒犻櫎鏈烘瀯淇℃伅{}锛�" , ids);
+ log.info("鍒犻櫎鏈烘瀯淇℃伅{}锛�", ids);
return toAjax(baseOrganizationService.removeByIds(Arrays.asList(ids)));
}
--
Gitblit v1.9.3