From 3ef1a05250ad012fc1c6d00d6e367ade89424200 Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Thu, 16 May 2024 20:27:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/whdc/model/dto/UserDto.java       |  5 -----
 src/main/java/com/whdc/model/vo/AddressBookVo.java  |  4 ++++
 .../java/com/whdc/service/impl/UserServiceImpl.java | 13 ++++---------
 src/main/resources/mapper/AddressBookMapper.xml     |  3 ++-
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/whdc/model/dto/UserDto.java b/src/main/java/com/whdc/model/dto/UserDto.java
index 84130de..b553a8f 100644
--- a/src/main/java/com/whdc/model/dto/UserDto.java
+++ b/src/main/java/com/whdc/model/dto/UserDto.java
@@ -17,11 +17,6 @@ public class UserDto {
     @NotEmpty(message = "用户编号不能为空")
     private String id;
 
-
-    @ApiParam(value = "登录名")
-    @NotEmpty(message = "登录名不能为空")
-    private String loginName;
-
     @ApiParam(value = "旧密码")
     @NotEmpty(message = "旧密码不能为空")
     private String oldPassword;
diff --git a/src/main/java/com/whdc/model/vo/AddressBookVo.java b/src/main/java/com/whdc/model/vo/AddressBookVo.java
index b817e17..3e10275 100644
--- a/src/main/java/com/whdc/model/vo/AddressBookVo.java
+++ b/src/main/java/com/whdc/model/vo/AddressBookVo.java
@@ -32,6 +32,10 @@ public class AddressBookVo extends AddressBook{
     @ApiModelProperty(value = "组织名称")
     private String oname;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "行政区划名称")
+    private String adnm;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "0:常用联系人,1:置顶联系人,2: 组织置顶,3: 单位置顶,4: 行政区划置顶")
     private Integer ftype;
diff --git a/src/main/java/com/whdc/service/impl/UserServiceImpl.java b/src/main/java/com/whdc/service/impl/UserServiceImpl.java
index 0e28469..fd2eeb8 100644
--- a/src/main/java/com/whdc/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/whdc/service/impl/UserServiceImpl.java
@@ -118,23 +118,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     public ResultJson updatePwd(UserDto dto) {
 
 
-        User byId = this.getById(dto.getId());
-        if (Objects.isNull(byId)) {
+        User sysUser = this.getById(dto.getId());
+        if (Objects.isNull(sysUser)) {
 
             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())) {
             // 更新密码
-            byId.setPassword(getPassword(sysUser.getSalt() ,dto.getNewPassword()));
-            return ResultJson.ok(byId.updateById());
+            sysUser.setPassword(getPassword(sysUser.getSalt() ,dto.getNewPassword()));
+            return ResultJson.ok(sysUser.updateById());
         }
 
         return ResultJson.error("密码错误");
diff --git a/src/main/resources/mapper/AddressBookMapper.xml b/src/main/resources/mapper/AddressBookMapper.xml
index f8ed39b..b71f70c 100644
--- a/src/main/resources/mapper/AddressBookMapper.xml
+++ b/src/main/resources/mapper/AddressBookMapper.xml
@@ -5,11 +5,12 @@
 
     <select id="page" resultType="com.whdc.model.vo.AddressBookVo">
         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
             ADDRESS_BOOK AB
         LEFT JOIN ORGANIZATION O  ON AB.ORGANIZATION = O.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 USERS U ON U.AB_ID = AB.ID
         LEFT JOIN FC F ON F.AB_ID = AB.ID AND F.USER_ID = #{dto.userId}