优化 和修改bug

liujie

2025-07-15 8652e69d17ab0c1a5884c662a9f3f950ddf57948

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/SystemUserController.java

@@ -120,14 +120,43 @@
      Set<String> collect1 = new HashSet<>();
      if(collect.size() > 0){
         LambdaQueryWrapper<SystemMenu> queryWrapper = new LambdaQueryWrapper<SystemMenu>().in(SystemMenu::getId, collect);
         if(systemUser.getSystemRoleId()!=1){
            queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/system_setting/position_management", "/system_setting/position_management/add", "/system_setting/position_management/del",
                  "/system_setting/role_management", "/system_setting/role_management/add", "/system_setting/role_management/edit", "/system_setting/role_management/del",
                  "/work_order_transaction_management/work_order_item_configuration", "/work_order_transaction_management/work_order_item_configuration/save",
                  "/work_order_transaction_management/problem_type_management", "/work_order_transaction_management/problem_type_management/add",
                  "/work_order_transaction_management/problem_type_management/edit", "/work_order_transaction_management/problem_type_management/del", "/work_order_transaction_management/banner_management",
                  "/work_order_transaction_management/banner_management/add", "/work_order_transaction_management/banner_management/edit", "/work_order_transaction_management/banner_management/del","/complaint/assign"));
         if(systemUser.getSystemRoleId()>2 && systemUser.getAccountLevel()==2){
            queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/work_order_transaction_management","/work_order_transaction_management/work_order_item_configuration"
            ,"/work_order_transaction_management/work_order_item_configuration/save","/system_setting","/system_setting/position_management","/system_setting/position_management/add"
            ,"/system_setting/position_management/edit","/system_setting/position_management/del","/system_setting/role_management","/system_setting/role_management/add"
            ,"/system_setting/role_management/edit","/system_setting/role_management/del","/system_setting/role_management/detail"));
         }
         if(systemUser.getSystemRoleId()<3 && systemUser.getAccountLevel()==3){
            queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/work_order_transaction_management","/work_order_transaction_management/work_order_item_configuration"
            ,"/work_order_transaction_management/work_order_item_configuration/save"));
         }
         if(systemUser.getSystemRoleId()>2 && systemUser.getAccountLevel()==3){
            queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/work_order_transaction_management","/work_order_transaction_management/work_order_item_configuration"
                  ,"/work_order_transaction_management/work_order_item_configuration/save","/system_setting","/system_setting/position_management","/system_setting/position_management/add"
                  ,"/system_setting/position_management/edit","/system_setting/position_management/del","/system_setting/role_management","/system_setting/role_management/add"
                  ,"/system_setting/role_management/edit","/system_setting/role_management/del","/system_setting/role_management/detail"));
         }
         if(systemUser.getSystemRoleId()<3 && systemUser.getAccountLevel()==4){
            queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/work_order_transaction_management","/work_order_transaction_management/work_order_item_configuration"
                  ,"/work_order_transaction_management/work_order_item_configuration/save"));
         }
         if(systemUser.getSystemRoleId()>2 && systemUser.getAccountLevel()==4){
            queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/work_order_transaction_management","/work_order_transaction_management/work_order_item_configuration"
                  ,"/work_order_transaction_management/work_order_item_configuration/save","/system_setting","/system_setting/position_management","/system_setting/position_management/add"
                  ,"/system_setting/position_management/edit","/system_setting/position_management/del","/system_setting/role_management","/system_setting/role_management/add"
                  ,"/system_setting/role_management/edit","/system_setting/role_management/del","/system_setting/role_management/detail"));
         }


//            queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/system_setting/position_management", "/system_setting/position_management/add", "/system_setting/position_management/del",
//                  "/system_setting/role_management", "/system_setting/role_management/add", "/system_setting/role_management/edit", "/system_setting/role_management/del",
//                  "/work_order_transaction_management/work_order_item_configuration", "/work_order_transaction_management/work_order_item_configuration/save",
//                  "/work_order_transaction_management/problem_type_management", "/work_order_transaction_management/problem_type_management/add",
//                  "/work_order_transaction_management/problem_type_management/edit", "/work_order_transaction_management/problem_type_management/del", "/work_order_transaction_management/banner_management",
//                  "/work_order_transaction_management/banner_management/add", "/work_order_transaction_management/banner_management/edit", "/work_order_transaction_management/banner_management/del","/complaint/assign","/complaint/assign/list","/complaint/assign/assign","/complaint/assign/export"
//                  ,"/statistics","/logManagement","/logManagement/list","/party_member","/party_member/list","/party_member/add","/party_member/edit","/party_member/del","/party_member/detail"
//            ,"/party_member/freeze","/party_member/import","/party_member/export","/work_order_transaction_management/problem_type_management","/work_order_transaction_management/problem_type_management/edit"
//            ,"/work_order_transaction_management/problem_type_management/add","/work_order_transaction_management/problem_type_management/del",""));
         List<SystemMenu> systemMenus = systemMenuService.list(queryWrapper);
         collect1 = systemMenus.stream().map(SystemMenu::getUrl).collect(Collectors.toSet());
      }
@@ -154,6 +183,8 @@
            tokenVo.setCommunityId(systemUser.getCommunityId().toString());
            break;
      }
      tokenVo.setOneDepartmentId(systemUser.getOneDepartmentId());
      tokenVo.setSystemRoleId(systemUser.getSystemRoleId());
      return R.ok(tokenVo);
   }

@@ -176,7 +207,7 @@
   public R<IPage<SystemUserListVo>> list(SystemUserList query){
      Integer id = this.getLoginUserInfoWest().getId();
      SystemUser user = systemUserService.getById(id);
      if(user.getSystemRoleId()!=1){
      if(user.getSystemRoleId()>2){
         return R.ok(new Page<>());
      }
      IPage<SystemUserListVo> list = systemUserService.list(user, query);