lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码提交

master
徐杰盟 2024-05-16 20:27:41 +08:00
parent 66bcd8870f
commit 3ef1a05250
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/whdc/model/dto/UserDto.java
View File

@ -17,11 +17,6 @@ public class UserDto {
@NotEmpty(message = "用户编号不能为空") @NotEmpty(message = "用户编号不能为空")
private String id; private String id;
@ApiParam(value = "登录名")
@NotEmpty(message = "登录名不能为空")
private String loginName;
@ApiParam(value = "旧密码") @ApiParam(value = "旧密码")
@NotEmpty(message = "旧密码不能为空") @NotEmpty(message = "旧密码不能为空")
private String oldPassword; private String oldPassword;

4
src/main/java/com/whdc/model/vo/AddressBookVo.java
View File

@ -32,6 +32,10 @@ public class AddressBookVo extends AddressBook{
@ApiModelProperty(value = "组织名称") @ApiModelProperty(value = "组织名称")
private String oname; private String oname;
@TableField(exist = false)
@ApiModelProperty(value = "行政区划名称")
private String adnm;
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "0:常用联系人,1:置顶联系人,2: 组织置顶,3: 单位置顶,4: 行政区划置顶") @ApiModelProperty(value = "0:常用联系人,1:置顶联系人,2: 组织置顶,3: 单位置顶,4: 行政区划置顶")
private Integer ftype; private Integer ftype;

13
src/main/java/com/whdc/service/impl/UserServiceImpl.java
View File

@ -118,23 +118,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
public ResultJson updatePwd(UserDto dto) { public ResultJson updatePwd(UserDto dto) {
User byId = this.getById(dto.getId()); User sysUser = this.getById(dto.getId());
if (Objects.isNull(byId)) { if (Objects.isNull(sysUser)) {
return ResultJson.error("当前数据不存在"); return ResultJson.error("当前数据不存在");
} }
User sysUser = findByLoginName(dto.getLoginName());
if (!dto.getLoginName().equals(byId.getUsername())) {
throw new MyException("用户名或密码错误");
}
if (getPassword(sysUser.getSalt() ,dto.getOldPassword()).equals(sysUser.getPassword())) { if (getPassword(sysUser.getSalt() ,dto.getOldPassword()).equals(sysUser.getPassword())) {
// 更新密码 // 更新密码
byId.setPassword(getPassword(sysUser.getSalt() ,dto.getNewPassword())); sysUser.setPassword(getPassword(sysUser.getSalt() ,dto.getNewPassword()));
return ResultJson.ok(byId.updateById()); return ResultJson.ok(sysUser.updateById());
} }
return ResultJson.error("密码错误"); return ResultJson.error("密码错误");

3
src/main/resources/mapper/AddressBookMapper.xml
View File

@ -5,11 +5,12 @@
<select id="page" resultType="com.whdc.model.vo.AddressBookVo"> <select id="page" resultType="com.whdc.model.vo.AddressBookVo">
SELECT SELECT
AB.*,F.SORT FSORT,F.ID FCID,U.ROLE,F.TYPE FTYPE,IF(O.NAME IS NULL,UD.NAME,O.NAME) ONAME AB.*,F.SORT FSORT,F.ID FCID,U.ROLE,F.TYPE FTYPE,IF(O.NAME IS NULL,UD.NAME,O.NAME) ONAME,A.ADNM
FROM FROM
ADDRESS_BOOK AB ADDRESS_BOOK AB
LEFT JOIN ORGANIZATION O ON AB.ORGANIZATION = O.ID LEFT JOIN ORGANIZATION O ON AB.ORGANIZATION = O.ID
LEFT JOIN UNIT_DICT UD ON AB.ORGANIZATION = UD.ID LEFT JOIN UNIT_DICT UD ON AB.ORGANIZATION = UD.ID
LEFT JOIN ADINFO A ON AB.ADCD = A.ADCD
LEFT JOIN AB_UD_R R ON R.AD_ID = AB.ID LEFT JOIN AB_UD_R R ON R.AD_ID = AB.ID
LEFT JOIN USERS U ON U.AB_ID = AB.ID LEFT JOIN USERS U ON U.AB_ID = AB.ID
LEFT JOIN FC F ON F.AB_ID = AB.ID AND F.USER_ID = #{dto.userId} LEFT JOIN FC F ON F.AB_ID = AB.ID AND F.USER_ID = #{dto.userId}