From b21a75be9e6805d63b7f06e78b1b99c114b7b8c6 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 22 九月 2023 08:49:21 +0800
Subject: [PATCH] 1、修改分类授权查询树的接口。

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeApplyWebManagementService.java         |    3 +++
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java |   14 ++++++++++----
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml                              |    2 +-
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java    |   23 +++++++++++++++++++++++
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java
index 21edf3b..445c0b5 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java
@@ -10,6 +10,7 @@
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -52,15 +53,37 @@
 		return R.success("鏌ヨ鎴愬姛");
 	}
 
+	/**
+	 * 鎺ュ彛绋嬪簭鎺堟潈绠$悊涓垎绫绘巿鏉冨姛鑳�
+	 * @param list 鎺堟潈閫変腑鐨勬暟鎹�
+	 * @param systemOid 绯荤粺鐨刼id
+	 * @param systemId	绯荤粺鐨刬d
+	 * @return
+	 */
 	@PostMapping( "/batchAddSave")
 	public R batchAddSave(@RequestBody List<SystemClassifyRole> list,String systemOid,String systemId){
 		return codeApplyWebManagementService.batchAddSave(list,systemOid,systemId);
 //		return R.success("dddd");
 	}
 
+	/**
+	 * 缂栫爜鍒嗙被鏍戞煡璇㈡帴鍙�
+	 * @param systemOid 绯荤粺鐨刼id
+	 * @param systemId 绯荤粺鐨刬d
+	 * @return
+	 */
 	@GetMapping("/getSystemClassifyRoleTree")
 	public List<Tree> getSystemClassifyRoleTree(String systemOid,String systemId){
 		return codeApplyWebManagementService.getSystemClassifyRoleTree(systemOid,systemId);
 	}
 
+	/**
+	 * 缂栫爜鍒嗙被鏍戞煡璇㈡帴鍙�
+	 * @param paramMap systemOid绯荤粺鐨刼id,systemId绯荤粺鐨刬d
+	 * @return
+	 */
+	@GetMapping("/getAuthTree")
+	public List<Tree> getAuthTree(@RequestParam HashMap<String,String> paramMap){
+		return codeApplyWebManagementService.getAuthTree(paramMap);
+	}
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeApplyWebManagementService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeApplyWebManagementService.java
index 3ea2f51..52a2a80 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeApplyWebManagementService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeApplyWebManagementService.java
@@ -5,10 +5,13 @@
 import com.vci.ubcs.starter.web.pagemodel.Tree;
 import org.springblade.core.tool.api.R;
 
+import java.util.HashMap;
 import java.util.List;
 
 public interface ICodeApplyWebManagementService extends IService<SystemClassifyRole> {
 	R batchAddSave(List<SystemClassifyRole> list,String systemOid,String systemId);
 
 	List<Tree> getSystemClassifyRoleTree(String systemOid, String systemId);
+
+	List<Tree> getAuthTree(HashMap<String, String> paramMap);
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java
index ca874f0..16c825a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java
@@ -17,10 +17,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -87,4 +84,13 @@
 		});
 		return tree;
 	}
+
+	@Override
+	public List<Tree> getAuthTree(HashMap<String, String> paramMap) {
+		QueryWrapper<SystemClassifyRole> wrapper = new QueryWrapper<>();
+		wrapper.eq("systemOid",paramMap.get("systemOid"));
+		wrapper.eq("systemId",paramMap.get("systemId"));
+
+		return null;
+	}
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml
index 8c7470e..7a9e2ce 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml
@@ -70,7 +70,7 @@
                pc.SYSTEMID,
                p.oid CLASSIFYOID,
                p.id CLASSIFYID,
-               case when pc.selected is null then false else  pc.SELECTED end SELECTED,
+               case when pc.selected is null then false when pc.selected = 0 then false else  pc.SELECTED end SELECTED,
                p.PARENTCODECLASSIFYOID CLASSPARENTOID
         from PL_CODE_CLASSIFY p ,
              PL_CODE_SYSTEM_CLASSIFY_ROLE pc

--
Gitblit v1.9.3