bug修改

sop-business/src/main/java/com/qmth/sop/business/service/impl/SysUserServiceImpl.java

@@ -299,9 +299,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 sysUserService.save(sysUser);
                 sysUserRoleService.addUserRolePrivilege(sysUser, sysUser.getRoleIds());
             } else {//修改用户
-                sysUser.updatePasswordInfo(sysUser.getMobileNumber());
                 SysUser dbUser = this.getById(sysUser.getId());
                 Optional.ofNullable(dbUser).orElseThrow(() -> ExceptionResultEnum.USER_NO_EXISTS.exception());
+                sysUser.setPassword(dbUser.getPassword());
 
                 List<SysUserRole> sysUserRoleList = commonCacheService.userRolePrivilegeCache(sysUser.getId());
                 List<Long> userRolesList = Arrays.asList(sysUser.getRoleIds());

sop-business/src/main/resources/mapper/SysMessageMapper.xml

@@ -21,9 +21,10 @@
         LEFT JOIN t_b_user_archives ua ON u.mobile_number = ua.mobile_number
         LEFT JOIN sys_supplier s ON s.id = m.supplier_id
         LEFT JOIN t_b_service bs ON bs.id = m.service_id
-        WHERE
-        m.notice_id = #{noticeId}
         <where>
+            <if test="noticeId != null and noticeId != ''">
+                and m.notice_id = #{noticeId}
+            </if>
             <if test="city != null and city != ''">
                 and ua.city = #{city}
             </if>