From 3f69b4dfc585c4dfbc3c07a6acf5cdd838033636 Mon Sep 17 00:00:00 2001
From: liuguocan <527956374@qq.com>
Date: 星期二, 28 十一月 2023 14:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
index 741e765..bdfe0a0 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
@@ -5,6 +5,7 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.excel.exception.ExcelDataConvertException;
import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.FinSysTenantUtils;
import com.consum.base.pojo.FinSysTenantParam;
import com.consum.base.pojo.FinSysTenantSearchParam;
@@ -41,7 +42,6 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -133,7 +133,12 @@
* @Date 2023/7/14 13:59
*/
@RequestMapping("/select/list")
- public ResponseValue allocatedList(FinSysTenantSearchParam param) {
+ public ResponseValue allocatedList() {
+ FinSysTenantSearchParam param = CommonUtil.getObjFromReq(FinSysTenantSearchParam.class);
+ FinSysTenantSearchParam param2 = new FinSysTenantSearchParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
FinSysTenantUser sysInfo = getSysInfo();
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -308,7 +313,12 @@
* @Description 涓嶅垎椤垫煡璇�
*/
@RequestMapping("/select/allList")
- public ResponseValue allList(FinSysTenantSearchParam param) {
+ public ResponseValue allList() {
+ FinSysTenantSearchParam param = CommonUtil.getObjFromReq(FinSysTenantSearchParam.class);
+ FinSysTenantSearchParam param2 = new FinSysTenantSearchParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
StringBuilder whStr = new StringBuilder("where 1=1 and status = 1 and is_delete = 0 ");
HashMap parameter = new HashMap<>();
if (param.getFirstZmS() != null && !param.getFirstZmS().equals("")) {
@@ -332,7 +342,12 @@
* @date 2023/10/4
*/
@PostMapping("/del")
- public ResponseValue del(@RequestBody FinSysTenantParam param) {
+ public ResponseValue del() {
+ FinSysTenantParam param = CommonUtil.getObjFromReqBody(FinSysTenantParam.class);
+ FinSysTenantParam finSysTenantParam = new FinSysTenantParam();
+ CommonUtil.copyProperties(param, finSysTenantParam);
+ param = finSysTenantParam;
+
if (param.getId() == null) {
return ResponseValue.error("鏈烘瀯id涓虹┖");
}
@@ -347,7 +362,12 @@
* @date 2023/10/4
*/
@PostMapping("/add")
- public ResponseValue add(@RequestBody FinSysTenantParam param) {
+ public ResponseValue add() {
+ FinSysTenantParam param = CommonUtil.getObjFromReqBody(FinSysTenantParam.class);
+ FinSysTenantParam finSysTenantParam = new FinSysTenantParam();
+ CommonUtil.copyProperties(param, finSysTenantParam);
+ param = finSysTenantParam;
+
if (param == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
@@ -493,8 +513,13 @@
* @date 2023/10/6
*/
@PostMapping("/edit")
- public ResponseValue edit(@RequestBody FinSysTenant finSysTenant) {
- Long id = finSysTenant.getId();
+ public ResponseValue edit() {
+ FinSysTenant param = CommonUtil.getObjFromReqBody(FinSysTenant.class);
+ FinSysTenant finSysTenant = new FinSysTenant();
+ CommonUtil.copyProperties(param, finSysTenant);
+ param = finSysTenant;
+
+ Long id = param.getId();
if (id == null || id.longValue() <= 0) {
return ResponseValue.error("缂栬緫鐨勬満鏋勪笉瀛樺湪");
}
@@ -506,7 +531,7 @@
// if (finSysTenant1.getLv() != 1) {
// return ResponseValue.error("鏆傛棤淇敼鏉冮檺");
// }
- int num = this.finSysTenantService.updateFinSysTenant(finSysTenant, this.getSysInfo());
+ int num = this.finSysTenantService.updateFinSysTenant(param, this.getSysInfo());
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("缂栬緫澶辫触锛�");
}
--
Gitblit v1.9.1