Merge branch 'master' of http://49.233.37.222:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysBpmNodeScriptController.java

@@ -117,9 +117,8 @@ public class SysBpmNodeScriptController extends BaseController
     /**
      *  根据scriptKey获取流程节点脚本详细信息
      */
-    @Anonymous
-    @GetMapping("/selectSysBpmNodeScriptByScriptKey/{scriptKey}")
-    public AjaxResult selectSysBpmNodeScriptByScriptKey(@PathVariable("scriptKey") String scriptKey){
+    @GetMapping("/selectSysBpmNodeScriptByScriptKey")
+    public AjaxResult selectSysBpmNodeScriptByScriptKey(String scriptKey){
         return success(sysBpmNodeScriptService.selectSysBpmNodeScriptByScriptKey(scriptKey));
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.system;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.annotation.Anonymous;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -269,9 +270,8 @@ public class SysRoleController extends BaseController
     /**
      * 根据角色权限字符查询该角色下是否存在真实用户
      */
-    @Anonymous
-    @GetMapping("/selectUserByRoleKey/{roleKeys}")
-    public AjaxResult selectUserByRoleKey(@PathVariable("roleKeys") List<String> roleKeys){
-        return AjaxResult.success(roleService.selectUserByRoleKey(roleKeys));
+    @GetMapping("/selectUserByRoleKey")
+    public AjaxResult selectUserByRoleKey(String roleKeys){
+        return AjaxResult.success(roleService.selectUserByRoleKey((List<String>) JSON.parse(roleKeys)));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -11,14 +11,7 @@ import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -299,9 +292,8 @@ public class SysUserController extends BaseController
     /**
      * 查询这组用户中是否存在真实用户
      */
-    @Anonymous
-    @GetMapping("/selectUserByUserIds/{userIds}")
-    public AjaxResult selectUserByUserIds(@PathVariable("userIds") List<Long> userIds){
-        return AjaxResult.success(userService.selectUserByUserIds(userIds));
+    @GetMapping("/selectUserByUserIds")
+    public AjaxResult selectUserByUserIds(String userIds){
+        return AjaxResult.success(userService.selectUserByUserIds((List<Long>) JSON.parse(userIds)));
     }
 }

ruoyi-system/src/main/resources/sql/initialize_sys_tenant_menu.json

@@ -1098,5 +1098,55 @@
         "children": [],
         "tenantName": null,
         "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-10-11 09:28:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 4409,
+        "menuName": "弹窗管理",
+        "parentName": null,
+        "parentId": 1103,
+        "orderNum": 5,
+        "path": "tableDialog",
+        "component": "dialogTemplate/indexTable",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "",
+        "icon": "bpmn-icon-call-activity",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-10-11 09:28:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 4410,
+        "menuName": "弹窗编辑",
+        "parentName": null,
+        "parentId": 1103,
+        "orderNum": 6,
+        "path": "dialogMange",
+        "component": "dialogMange/index",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "1",
+        "status": "0",
+        "perms": "",
+        "icon": "bpmn-icon-collaboration",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
     }
 ]