1. 报价返回出险信息字段修改。

  2. 修改用户密码会自动改变问题。
  3. 订单查询优化。

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -366,9 +366,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         userRole.setRoleId(StringUtils.toLong(sysUser.getRoleId()));
         sysUserRoleService.save(userRole);
 
-        if(StringUtils.isNotEmpty(sysUser.getReferrerId())){
+        if (StringUtils.isNotEmpty(sysUser.getReferrerId())) {
             //推荐人
-            esmUserReferrerService.addReferrer(sysUser.getReferrerId(),userId);
+            esmUserReferrerService.addReferrer(sysUser.getReferrerId(), userId);
         }
 //        EsmUserReferrer eur = new EsmUserReferrer();
 //        eur.setId(sysUser.getId());
@@ -379,7 +379,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
 //        esmUserReferrerService.save(eur);
 
         SysUserInfo userInfo = sysUserVo.getSysUserInfo();
-        if (userInfo != null){
+        if (userInfo != null) {
             userInfo.setId(sysUser.getId());
         }
 //        userInfo.setId(sysUser.getId());
@@ -397,6 +397,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
             String pwd = PasswordUtils.encode(sysUser.getPassword(), salt);
             sysUser.setPassword(pwd);
             sysUser.setSalt(salt);
+        } else {
+            sysUser.setPassword(null);
         }
         updateById(sysUser);
 
@@ -408,9 +410,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         userRole.setLastUpdateTime(new Date());
         sysUserRoleService.updateById(userRole);
 
-        if(StringUtils.isNotEmpty(sysUser.getReferrerId())){
+        if (StringUtils.isNotEmpty(sysUser.getReferrerId())) {
             //推荐人
-            esmUserReferrerService.addReferrer(sysUser.getReferrerId(),userId);
+            esmUserReferrerService.addReferrer(sysUser.getReferrerId(), userId);
         }
 //        EsmUserReferrer referrer = esmUserReferrerService.getById(userId);
 //        EsmUserReferrer eur = new EsmUserReferrer();
@@ -427,8 +429,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         //用户详情信息
         SysUserInfo sysUserInfo = sysUserVo.getSysUserInfo();
         sysUserInfo.setId(userId);
+        if(null == sysUserInfo.getRemark())sysUserInfo.setRemark("");
         sysUserInfoService.saveOrUpdate(sysUserInfo);
-//        sysUserInfoService.updateById(sysUserInfo);
         return HttpResult.ok("修改成功");
     }
 }

src/main/java/com/ydtech/modules/ins/model/vo/QuoteRespVo.java

@@ -80,7 +80,7 @@ public class QuoteRespVo {
 
     //add 增加返回出险信息  lig 2023-09-14
     @ApiModelProperty("出险信息")
-    private String accidentInfo;
+    private String accidentInfoStr;
 
     @ApiModelProperty("扩展字段")
     private Object extendInfo;

src/main/java/com/ydtech/modules/ins/model/yc/YcBuildData.java

@@ -264,7 +264,7 @@ public class YcBuildData {
             //连续承保年数
             int nInsureYears = StringUtils.toInt(rd.getPrmCoef().getNInsureYears());
     //        String.format("连续承保期间出险次数 %s ,连续承保年数 %s",nClaimTimes,nInsureYears);
-            quoteRespVo.setAccidentInfo(String.format("连续承保期间出险次数 %s ,连续承保年数 %s",nClaimTimes,nInsureYears));
+            quoteRespVo.setAccidentInfoStr(String.format("连续承保期间出险次数 %s ,连续承保年数 %s",nClaimTimes,nInsureYears));
         }
 
         //平台返回信息

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -180,7 +180,7 @@
             and o.orderno = #{orderNo, jdbcType=VARCHAR}
         </if>
         <if test="deptId != null and deptId != ''">
-            and u.dept_id in (#{deptId, jdbcType=VARCHAR})
+            and u.dept_id like CONCAT(#{deptId, jdbcType=VARCHAR}, '%')
         </if>
         <if test="deptId == null and deptId == '' and userId != null and userId != ''">
             and o.userid = #{userId, jdbcType=VARCHAR}