diff --git a/core/src/main/java/com/dite/znpt/domain/vo/UserResp.java b/core/src/main/java/com/dite/znpt/domain/vo/UserResp.java index db10ead..d461435 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/UserResp.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/UserResp.java @@ -19,7 +19,7 @@ public class UserResp extends UserReq implements Serializable{ @Serial private static final long serialVersionUID = -2831232930040845716L; - @ApiModelProperty("用户名") + @ApiModelProperty("用户id") private String userId; @ApiModelProperty("所属部门") @@ -39,6 +39,8 @@ public class UserResp extends UserReq implements Serializable{ @ApiModelProperty("在职状态描述") private String userStatusLabel; + @ApiModelProperty("用户姓名") + private String userName; diff --git a/core/src/main/java/com/dite/znpt/service/impl/UserServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/UserServiceImpl.java index 7b1bc01..cd4c41d 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/UserServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/UserServiceImpl.java @@ -88,9 +88,9 @@ public class UserServiceImpl extends ServiceImpl impleme @Override public List list(UserListReq req) { return this.baseMapper.queryBySelective(req).stream().map(resp -> { - resp.setUserTypeLabel(UserTypeEnum.getDescByCode(resp.getUserType())); - resp.setUserStatusLabel(UserStatusEnum.getDescByCode(resp.getUserStatus())); - return resp; + resp.setUserTypeLabel(UserTypeEnum.getDescByCode(resp.getUserType())); + resp.setUserStatusLabel(UserStatusEnum.getDescByCode(resp.getUserStatus())); + return resp; }).collect(Collectors.toList()); } @@ -107,7 +107,8 @@ public class UserServiceImpl extends ServiceImpl impleme UserEntity entity = this.getById(userId); UserResp userResp= Converts.INSTANCE.toUserResp(entity); if(StrUtil.isNotBlank(userResp.getDeptId())){ - userResp.setUserId(deptService.getById(userResp.getDeptId()).getDeptName()); + userResp.setUserName(entity.getName()); + userResp.setDeptName(deptService.getById(userResp.getDeptId()).getDeptName()); } userResp.setUserTypeLabel(UserTypeEnum.getDescByCode(userResp.getUserType())); userResp.setUserStatusLabel(UserStatusEnum.getDescByCode(userResp.getUserStatus())); diff --git a/web/src/main/resources/application-dev.yml b/web/src/main/resources/application-dev.yml index b2ab175..2268475 100644 --- a/web/src/main/resources/application-dev.yml +++ b/web/src/main/resources/application-dev.yml @@ -2,13 +2,14 @@ server: # 服务器的HTTP端口,默认为8080 port: 8888 + address : 0.0.0.0 # 监听所有网络接口 # 数据源配置 spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://39.99.201.243:3306/test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://39.99.201.243:3306/test01?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: BUw8YW6%@^8q druid: