系统菜单调整2

hr-api/hr-api-system/src/main/java/com/hr/system/api/domain/SysRole.java

@@ -127,7 +127,7 @@ public class SysRole extends BaseEntity
         this.roleName = roleName;
     }
 
-    @NotBlank(message = "权限字符不能为空")
+//    @NotBlank(message = "权限字符不能为空")
     @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
     public String getRoleKey()
     {

hr-modules/hr-system/src/main/java/com/hr/system/controller/SysMenuController.java

@@ -89,7 +89,7 @@ public class SysMenuController extends BaseController
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysMenu menu)
     {
-        if(menu.getUrl()==null || menu.getUrl().equals("")){
+        if(menu.getMenuType().equals("M") && (menu.getUrl()==null || menu.getUrl().equals(""))){
             return error("新增菜单'" + menu.getMenuName() + "'失败，菜单url不能为空");
         }
         if (!menuService.checkMenuNameUnique(menu))
@@ -114,7 +114,7 @@ public class SysMenuController extends BaseController
     {
         //有些操作权限可以不设置全路径，但是这样就只能实现界面进行权限控制
         //不能实现url网关拦截
-        if(menu.getUrl()==null || menu.getUrl().equals("")){
+        if(menu.getMenuType().equals("M") && ( menu.getUrl()==null || menu.getUrl().equals(""))){
             return error("修改菜单'" + menu.getMenuName() + "'失败，菜单url不能为空");
         }
         if (!menuService.checkMenuNameUnique(menu))

hr-modules/hr-system/src/main/java/com/hr/system/controller/SysUserController.java

@@ -392,8 +392,8 @@ public class SysUserController extends BaseController
 
 
 
-        Map<String, List<SysDeptDto>> groupedByDepTypemap = deptlist.stream()
-                .collect(Collectors.groupingBy(SysDeptDto::getDepType));
+//        Map<String, List<SysDeptDto>> groupedByDepTypemap = deptlist.stream()
+//                .collect(Collectors.groupingBy(SysDeptDto::getDepType));
 
 
         sysUserVo.setSysUser(sysUser);
@@ -413,17 +413,17 @@ public class SysUserController extends BaseController
 
         }
         for(SysMenu _m:menus){
-            depthCalcMenuMapDealMenu(_m,menumap,roleKeyMap);
+            depthCalcMenuMapDealMenu(_m,menumap,menumap,roleKeyMap);
         }
         return menumap;
     }
-    private  void depthCalcMenuMapDealMenu(SysMenu _m,JSONObject menumap,Map<String,Object> roleKeyMap){
-
+    private  void depthCalcMenuMapDealMenu(SysMenu _m,JSONObject menumap,JSONObject dynamicmap,Map<String,Object> roleKeyMap){
+        JSONObject _curmap=dynamicmap;
         if(_m.getUrl()!=null) {
-            menumap=getLastJson(_m,menumap);
+            _curmap=getLastJson(_m,menumap);
 
             if(StringUtils.isNotEmpty(_m.getUrlmatch())) {
-                delPermsSet(menumap, _m.getUrlmatch());
+                delPermsSet(_curmap, _m.getUrlmatch());
             }
         }
         JSONArray permsarr=new JSONArray();
@@ -448,7 +448,7 @@ public class SysUserController extends BaseController
         if(flag) {
             if (_m.getChildren() != null && _m.getChildren().size() > 0) {
                 for (SysMenu _m2 : _m.getChildren()) {
-                    depthCalcMenuMapDealMenu(_m2, menumap, roleKeyMap);
+                    depthCalcMenuMapDealMenu(_m2, menumap,_curmap, roleKeyMap);
                 }
             }
         }

hr-modules/hr-system/src/main/java/com/hr/system/controller/TestController.java

@@ -0,0 +1,29 @@
+package com.hr.system.controller;
+
+import com.hr.common.core.web.domain.AjaxResult;
+import com.hr.common.core.web.page.TableDataInfo;
+import com.hr.system.api.domain.SysUser;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author yaoy
+ * @createTime 2025/9/30 17:35
+ **/
+@RestController
+@RequestMapping("/test")
+public class TestController {
+
+    @GetMapping("/query")
+    public AjaxResult queryUserList(@RequestBody SysUser user)
+    {
+       return AjaxResult.success("query");
+    }
+
+    @GetMapping("/list")
+    public AjaxResult listList(@RequestBody SysUser user)
+    {
+        return AjaxResult.success("list");
+    }
+}

hr-modules/hr-system/src/main/resources/logback.xml

@@ -14,7 +14,7 @@
 
     <!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/info.log</file>
+<!--	    <file>${log.path}/info.log</file>-->
         <!-- 循环政策：基于时间创建日志文件 -->
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
@@ -36,7 +36,7 @@
 	</appender>
 
     <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/error.log</file>
+<!--	    <file>${log.path}/error.log</file>-->
         <!-- 循环政策：基于时间创建日志文件 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->

hr-modules/hr-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectRoleVo">
-	    select distinct r.role_id, r.role_name, r.role_key,r.role_urlmatch_key, r.role_sort, r.data_scope , r.role_dept_type, r.menu_check_strictly, r.dept_check_strictly,
+	    select distinct r.role_id, r.role_name, r.role_key,r.role_urlmatch_key, r.role_sort, r.data_scope , r.menu_check_strictly, r.dept_check_strictly,
             r.status, r.del_flag, r.create_time, r.remark 
         from sys_role r
 	        left join sys_user_role ur on ur.role_id = r.role_id
@@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		update sys_role
  		<set>
  			<if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
- 			<if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
+ 			<if test="roleKey != null ">role_key = #{roleKey},</if>
 			<if test="roleUrlmatchKey != null and roleUrlmatchKey != ''">role_urlmatch_key = #{roleUrlmatchKey},</if>
  			<if test="roleSort != null">role_sort = #{roleSort},</if>
  			<if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>