ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ADD: 检修计划添加项目负责人和项目成员

Browse Source
This commit is contained in:
贾同学
2025-09-08 10:21:34 +08:00
parent ecafa996a3
commit 7f2a61ba21
6 changed files with 66 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
user/src/main/java/com/njcn/gather/user/user/controller/SysUserController.java
View File

@@ -10,7 +10,9 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.LogUtil;
import com.njcn.gather.user.user.pojo.param.SysUserParam;
import com.njcn.gather.user.user.pojo.po.SysRole;
import com.njcn.gather.user.user.pojo.po.SysUser;
import com.njcn.gather.user.user.service.ISysUserRoleService;
import com.njcn.gather.user.user.service.ISysUserService;
import com.njcn.web.controller.BaseController;
import com.njcn.web.utils.HttpResultUtil;
@@ -24,6 +26,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.stream.Collectors;
/**
@@ -38,6 +41,7 @@ import java.util.List;
public class SysUserController extends BaseController {
private final ISysUserService sysUserService;
private final ISysUserRoleService sysUserRoleService;
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/list")
@@ -121,6 +125,13 @@ public class SysUserController extends BaseController {
String methodDescribe = getMethodDescribe("getAll");
LogUtil.njcnDebug(log, "{}，查询所有用户", methodDescribe);
List<SysUser> result = sysUserService.lambdaQuery().eq(SysUser::getState, DataStateEnum.ENABLE.getCode()).list();
result.forEach(user -> {
user.setPassword(null);
List<SysRole> sysRoles = sysUserRoleService.listRoleByUserId(user.getId());
user.setRoleIds(sysRoles.stream().map(SysRole::getId).collect(Collectors.toList()));
user.setRoleCodes(sysRoles.stream().map(SysRole::getCode).collect(Collectors.toList()));
user.setRoleNames(sysRoles.stream().map(SysRole::getName).collect(Collectors.toList()));
});
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
}

6
user/src/main/java/com/njcn/gather/user/user/pojo/po/SysUser.java
View File

@@ -1,7 +1,5 @@
package com.njcn.gather.user.user.pojo.po;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -10,11 +8,11 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import com.njcn.db.mybatisplus.bo.BaseEntity;
import io.swagger.models.auth.In;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
/**
@@ -91,6 +89,8 @@ public class SysUser extends BaseEntity implements Serializable {
@TableField(exist = false)
private List<String> roleIds;
@TableField(exist = false)
private List<String> roleCodes;
@TableField(exist = false)
private List<String> roleNames;