From c7fe2dfd0b1a3a986d9e8cd8f2b8a713ef404f69 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 18 十月 2024 10:06:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java
index 0651684..a7acfa1 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java
@@ -7,6 +7,7 @@
 import com.vci.dto.RoleInfoDTO;
 import com.vci.dto.RoleRightDTO;
 import com.vci.dto.RoleRightParamDTO;
+import com.vci.dto.RoleRightParamDTOS;
 import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
 import com.vci.frameworkcore.compatibility.SmHMSysModConfigServiceI;
 import com.vci.pagemodel.AppConfigDetailInfoVO;
@@ -28,9 +29,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
 
 /**
  * 棣栭〉绯荤粺妯″潡閰嶇疆鎺у埗鍣�
@@ -129,14 +128,19 @@
 
     /**
      * 淇濆瓨鎺堟潈鐨勬ā鍧�
-     * @param roleRightDTOS 鐢ㄦ埛閫夋嫨鎺堟潈妯″潡淇℃伅
-     * @param roleId 瑙掕壊涓婚敭
+     * @param roleDto 鐢ㄦ埛閫夋嫨鎺堟潈妯″潡淇℃伅
      * @return 鎺堟潈缁撴灉
      * @throws PLException
      */
     @PostMapping("/saveRoleRight")
-    public BaseResult<List<String>> saveRoleRight(@RequestBody List<RoleRightParamDTO> roleRightDTOS, String roleId) {
+    public BaseResult saveRoleRight(@RequestBody RoleRightParamDTOS roleDto) {
         try {
+
+            ArrayList<RoleRightParamDTO> roleRightDTOS = roleDto.getRoleData();
+            String roleId = roleDto.getRoleId();
+            if(StringUtils.isBlank(roleId)){
+                return BaseResult.fail("璇烽�夋嫨瑙掕壊锛�");
+            }
             return functionQueryService.saveRoleRight(roleRightDTOS, roleId);
         }catch (Exception e){
             e.printStackTrace();

--
Gitblit v1.9.3