From e2d97f3c90a6baa36b9edefe927225da907a27c6 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 19 十二月 2023 10:02:15 +0800
Subject: [PATCH] 去除默认机构默认仓库逻辑
---
consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java
index f3d3962..3f5f2d6 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java
@@ -1,16 +1,7 @@
package com.consum.base.controller;
-import com.consum.base.BaseController;
-import com.consum.base.core.utils.CommonUtil;
-import com.consum.base.pojo.FinSysServerSearchParam;
-import com.consum.base.pojo.FinSysServerVo;
-import com.consum.base.service.FinSysServerImpl;
-import com.consum.model.po.FinSysServer;
-import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.DateUtils;
-import com.walker.infrastructure.utils.NumberGenerator;
-import com.walker.web.ResponseValue;
import java.util.List;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -18,15 +9,30 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.pojo.FinSysServerSearchParam;
+import com.consum.base.pojo.FinSysServerVo;
+import com.consum.base.service.FinSysServerService;
+import com.consum.model.po.FinSysServer;
+import com.iplatform.model.po.S_role;
+import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.DateUtils;
+import com.walker.infrastructure.utils.NumberGenerator;
+import com.walker.web.ResponseValue;
+
+import io.swagger.annotations.Api;
+
+@Api(value = "绯荤粺鏈嶅姟淇℃伅", tags = "绯荤粺鏈嶅姟淇℃伅")
@RestController
@RequestMapping("/pc/fin/sys/server")
public class FinSysServerController extends BaseController {
- private FinSysServerImpl finSysServerImpl;
+ private FinSysServerService finSysServerServiceImpl;
@Autowired
- public void setfinSysCategory(FinSysServerImpl finSysServerImpl) {
- this.finSysServerImpl = finSysServerImpl;
+ public void setfinSysCategory(FinSysServerService finSysServerServiceImpl) {
+ this.finSysServerServiceImpl = finSysServerServiceImpl;
}
/**
@@ -36,7 +42,10 @@
*/
@GetMapping("/selectByDataScope")
public ResponseValue selectByDataScope(Integer dataScope) {
- return ResponseValue.success(finSysServerImpl.getByDataScope(dataScope));
+ List<S_role> roleList = finSysServerServiceImpl.getByDataScope(dataScope);
+ // 杩囨护浠撳簱绠＄悊鍛樼殑鏄剧ず
+ roleList.removeIf(role -> role.getRole_name().equals("浠撳簱绠＄悊鍛�"));
+ return ResponseValue.success(roleList);
}
/**
@@ -47,7 +56,7 @@
@GetMapping("/select/tree")
public ResponseValue selectFinSysCategoryTree() {
- List<FinSysServerVo> finSysCategoryVos = finSysServerImpl.queryAllCategory();
+ List<FinSysServerVo> finSysCategoryVos = finSysServerServiceImpl.queryAllCategory();
if (finSysCategoryVos != null) {
return ResponseValue.success(finSysCategoryVos);
}
@@ -57,7 +66,7 @@
@GetMapping("/select/detail")
public ResponseValue selectById(@RequestParam(name = "id") Long Id) {
- FinSysServer finSysServer = this.finSysServerImpl.get(new FinSysServer(Id));
+ FinSysServer finSysServer = this.finSysServerServiceImpl.get(new FinSysServer(Id));
if (finSysServer == null) {
return ResponseValue.error("鏌ヨ澶辫触锛�");
}
@@ -76,7 +85,7 @@
CommonUtil.copyProperties(param, param2);
param = param2;
- GenericPager<FinSysServer> pager = this.finSysServerImpl.selectServerListByPage(param);
+ GenericPager<FinSysServer> pager = this.finSysServerServiceImpl.selectServerListByPage(param);
return ResponseValue.success(pager);
}
@@ -99,7 +108,7 @@
param.setCreatedTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
param.setCreatedBy(this.getCurrentUser().getUser_name());
param.setLv(param.getParentId() + 1);
- int num = this.finSysServerImpl.insert(param);
+ int num = this.finSysServerServiceImpl.insert(param);
if (num > 0) {
return ResponseValue.success(1);
}
@@ -119,10 +128,7 @@
if (param == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
-// if(finSysServer.getLvType()!=null) {
-// finSysServer.setLv(Long.valueOf(finSysServer.getLvType()));
-// }
- int num = this.finSysServerImpl.save(param);
+ int num = this.finSysServerServiceImpl.save(param);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("缂栬緫澶辫触锛�");
}
}
--
Gitblit v1.9.1