Просмотр исходного кода

开发琐碎新功能(小功能)

1. api/userInfo/getUser 接口返回值新增deptId字段
2. 配合前端联调前端菜单按钮删除的接口(修改请求方式以及参数接收方式)
lipf 5 месяцев назад
Родитель
Сommit
33cf7e497b

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/vo/SysUserSelectVo.java

@@ -23,4 +23,7 @@ public class SysUserSelectVo {
 
     @Schema(description = "用户工号")
     private String workNumber;
+
+    @Schema(description = "部门序号")
+    private String deptId;
 }

+ 7 - 5
platform/src/main/java/com/jzg/controller/SysMenuController.java

@@ -15,8 +15,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 菜单控制器
@@ -47,10 +47,12 @@ public class SysMenuController extends BaseController {
         }
     }
 
-
-    @PostMapping(value = "/delete")
-    public HttpResult delete(@RequestBody List<SysMenu> records) {
-        List<String> ids = records.stream().map(SysMenu::getId).collect(Collectors.toList());
+    @DeleteMapping(value = "/delete/{id}")
+    public HttpResult delete(@PathVariable("id") String id) {
+        log.info("菜单删除:id=[{}]",id);
+        List<String> ids = new ArrayList<>();
+        ids.add(id);
+        //List<String> ids = records.stream().map(SysMenu::getId).collect(Collectors.toList());
         return HttpResult.ok(sysMenuService.removeBatchByIds(ids));
     }
 

+ 3 - 1
platform/src/main/java/com/jzg/service/impl/SysMenuServiceImpl.java

@@ -76,13 +76,14 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu>
 
     @Override
     public List<SysMenu> getRoleMenuTree(String systemCode, String userId) {
+        log.info("查询租户下的用户拥有的菜单权限。systemCode=[{}], userId=[{}] ", systemCode, userId);
         List<SysUserRole> sysUserRole = sysUserRoleMapper.selectByUserIdAndSysCodeOne(userId,systemCode);
         // modify by lipf ,2026年4月3日08:52:05, 解决NPE 异常
         if(sysUserRole == null || sysUserRole.isEmpty()){
             log.info("租户[{}]下的用户[{}]角色为空",systemCode, userId);
             return Collections.emptyList();
         }
-        List<SysMenu> menus = this.getMenuByRoleId(sysUserRole.stream().map(x->x.getRoleId()).toList());
+        List<SysMenu> menus = this.getMenuByRoleId(sysUserRole.stream().map(SysUserRole::getRoleId).toList());
         List<SysMenu> sysMenus = new ArrayList<>();
         for (SysMenu menu : menus) {
             if (menu.getParentId() == null || menu.getParentId().equalsIgnoreCase("0")) {
@@ -195,6 +196,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu>
                 .values()
                 .stream()
                 .toList();
+        log.info("根据角色序号查询有权限的菜单: roleIds=[{}]distinctMenuList=[{}]", JSONUtil.toJsonStr(roleIds), JSONUtil.toJsonStr(distinctMenuList));
         return distinctMenuList;
     }
 

+ 1 - 1
platform/src/main/java/com/jzg/service/impl/UserRoleServiceImpl.java

@@ -54,8 +54,8 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
 
     @Override
     public SysRoleVo roleGet(String roleId) {
-        log.info("查询角色的权限: roleId=[{}]",roleId);
         String userSystemCode = baseController.getUserSystemCode();
+        log.info("查询角色的权限: roleId=[{}],userSystemCode=[{}]",roleId, userSystemCode);
         SysRole sysRole = baseMapper.selectOne(new LambdaQueryWrapper<SysRole>()
                 .eq(SysRole::getId,roleId)
                 .eq(SysRole::getSystemCode,userSystemCode));

+ 1 - 1
tenant/organization/src/main/java/com/jzg/organization/controller/UserController.java

@@ -78,7 +78,7 @@ public class UserController extends BaseController {
 
     @Operation(summary = "获取人员列表接口", description = "获取人员列表接口")
     @PostMapping(value = "/getUser")
-    public HttpResult getUser(@RequestBody SysUserInfoListVo sysUserInfoListVo) {
+    public HttpResult<List<SysUserSelectVo>> getUser(@RequestBody SysUserInfoListVo sysUserInfoListVo) {
         return sysUserService.getUserSelect(sysUserInfoListVo);
     }
 

+ 1 - 1
tenant/organization/src/main/java/com/jzg/organization/service/SysUserService.java

@@ -38,7 +38,7 @@ public interface SysUserService extends IService<SysUser> {
      * @author lipf
      * @date 2026/4/24 15:56
      */
-    HttpResult getUserSelect(SysUserInfoListVo sysUserInfoListVo);
+    HttpResult<List<SysUserSelectVo>> getUserSelect(SysUserInfoListVo sysUserInfoListVo);
 
     /**
      * 添加业务员

+ 1 - 1
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -175,7 +175,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public HttpResult getUserSelect(SysUserInfoListVo sysUserInfoListVo) {
+    public HttpResult<List<SysUserSelectVo>> getUserSelect(SysUserInfoListVo sysUserInfoListVo) {
         log.info("getUserSelect获取人员列表:sysUserInfoListVo=[{}]", JSONUtil.toJsonStr(sysUserInfoListVo));
         return HttpResult.ok(baseMapper.getUserSelect(sysUserInfoListVo));
     }

+ 1 - 0
tenant/organization/src/main/resources/mapper/SysUserMapper.xml

@@ -21,6 +21,7 @@
     <select id="getUserSelect" resultType="com.jzg.commons.entity.vo.SysUserSelectVo">
         SELECT
         suji.id,
+        suji.dept_id,
         su.id as userId,
         suji.name,
         su.mobile,