cuizhibin
/
znpt-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

移除制度模块中与投票相关的方法

This commit is contained in:
wangna0328 2025-07-29 19:44:34 +08:00
parent d18690a3e8
commit 2b94b8846b
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/dite/znpt/domain/vo/UserResp.java
View File

@ -19,7 +19,7 @@ public class UserResp extends UserReq implements Serializable{
@Serial @Serial
private static final long serialVersionUID = -2831232930040845716L; private static final long serialVersionUID = -2831232930040845716L;
@ApiModelProperty("用户名") @ApiModelProperty("用户id")
private String userId; private String userId;
@ApiModelProperty("所属部门") @ApiModelProperty("所属部门")
@ -39,6 +39,8 @@ public class UserResp extends UserReq implements Serializable{
@ApiModelProperty("在职状态描述") @ApiModelProperty("在职状态描述")
private String userStatusLabel; private String userStatusLabel;
@ApiModelProperty("用户姓名")
private String userName;

3
core/src/main/java/com/dite/znpt/service/impl/UserServiceImpl.java
View File

@ -107,7 +107,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
UserEntity entity = this.getById(userId); UserEntity entity = this.getById(userId);
UserResp userResp= Converts.INSTANCE.toUserResp(entity); UserResp userResp= Converts.INSTANCE.toUserResp(entity);
if(StrUtil.isNotBlank(userResp.getDeptId())){ 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.setUserTypeLabel(UserTypeEnum.getDescByCode(userResp.getUserType()));
userResp.setUserStatusLabel(UserStatusEnum.getDescByCode(userResp.getUserStatus())); userResp.setUserStatusLabel(UserStatusEnum.getDescByCode(userResp.getUserStatus()));

3
web/src/main/resources/application-dev.yml
View File

@ -2,13 +2,14 @@
server: server:
# 服务器的HTTP端口，默认为8080 # 服务器的HTTP端口，默认为8080
port: 8888 port: 8888
address : 0.0.0.0 # 监听所有网络接口
# 数据源配置 # 数据源配置
spring: spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver 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 username: root
password: BUw8YW6%@^8q password: BUw8YW6%@^8q
druid: druid: