Compare commits
No commits in common. "7553097d1da1b58b272cf6854604d66cd7d11422" and "387af4998581a557325016cc3bbf74c3ad10a255" have entirely different histories.
7553097d1d
...
387af49985
|
|
@ -1,7 +1,6 @@
|
||||||
package com.electromagnetic.industry.software.manage.pojo.other;
|
package com.electromagnetic.industry.software.manage.pojo.other;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
@ -55,7 +54,7 @@ public class SingleUserResponse {
|
||||||
/**
|
/**
|
||||||
* 登录密码
|
* 登录密码
|
||||||
*/
|
*/
|
||||||
// private String userPwd;
|
private String userPwd;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 角色名称拼接字符串
|
* 角色名称拼接字符串
|
||||||
|
|
@ -94,15 +93,10 @@ public class SingleUserResponse {
|
||||||
*/
|
*/
|
||||||
private Integer isActivated;
|
private Integer isActivated;
|
||||||
|
|
||||||
/**
|
|
||||||
* 是否和默认密码相同
|
|
||||||
*/
|
|
||||||
private Integer isDefaultPwd;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 盐
|
* 盐
|
||||||
*/
|
*/
|
||||||
// private String salt;
|
private String salt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建人
|
* 创建人
|
||||||
|
|
|
||||||
|
|
@ -224,14 +224,6 @@ public class UserServiceImpl implements UserService {
|
||||||
String roles = String.join(",", roleList);
|
String roles = String.join(",", roleList);
|
||||||
singleUserResponse.setRoles(roles);
|
singleUserResponse.setRoles(roles);
|
||||||
singleUserResponse.setRoleList(roleList);
|
singleUserResponse.setRoleList(roleList);
|
||||||
|
|
||||||
// 检查密码是否和初始密码相同
|
|
||||||
if (user.getUserPwd().equals(SignUtils.MD5(UserConstants.DEFAULT_PASSWORD + user.getSalt()))) {
|
|
||||||
singleUserResponse.setIsDefaultPwd(1);
|
|
||||||
} else {
|
|
||||||
singleUserResponse.setIsDefaultPwd(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
list.add(singleUserResponse);
|
list.add(singleUserResponse);
|
||||||
}
|
}
|
||||||
UserSearchResponse userSearchResponse = new UserSearchResponse();
|
UserSearchResponse userSearchResponse = new UserSearchResponse();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue