From 48ef443170ee0cc12268bda0c686ffbd1d81671c Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 02 一月 2024 14:26:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 3de9388..e40e043 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,6 +1,5 @@
package com.consum.base.controller;
-import io.swagger.annotations.Api;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,10 +15,14 @@
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")
@@ -39,7 +42,10 @@
*/
@GetMapping("/selectByDataScope")
public ResponseValue selectByDataScope(Integer dataScope) {
- return ResponseValue.success(finSysServerServiceImpl.getByDataScope(dataScope));
+ List<S_role> roleList = finSysServerServiceImpl.getByDataScope(dataScope);
+ // 杩囨护浠撳簱绠＄悊鍛樼殑鏄剧ず
+ roleList.removeIf(role -> "浠撳簱绠＄悊鍛�".equals(role.getRole_name()));
+ return ResponseValue.success(roleList);
}
/**
@@ -122,9 +128,6 @@
if (param == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
-// if(finSysServer.getLvType()!=null) {
-// finSysServer.setLv(Long.valueOf(finSysServer.getLvType()));
-// }
int num = this.finSysServerServiceImpl.save(param);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("缂栬緫澶辫触锛�");
}
--
Gitblit v1.9.1