Merge branch 'dev-crm-0909' into 'release'

Dev crm 0909

See merge request !124

server/src/main/java/com/pica/cloud/account/account/server/resp/HospitalSaasUserDto.java

@@ -20,8 +20,10 @@ public class HospitalSaasUserDto {
     private String name;
     @ApiModelProperty("机构id")
     private Long hospitalId;
-    @ApiModelProperty("手机号")
+    @ApiModelProperty("手机号(密文)")
     private String mobile;
+    @ApiModelProperty("手机号(明文)")
+    private String phone;
     @ApiModelProperty("备注")
     private String comment;
     @ApiModelProperty("角色")

server/src/main/java/com/pica/cloud/account/account/server/service/impl/HospitalSaasUserServiceImpl.java

@@ -224,6 +224,7 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
             String phone = EncryptUtils.decryptContent(t.getMobile(), EncryptConstants.ENCRYPT_TYPE_MOBILE, EncryptConstants.ENCRYPT_DECRYPT_KEY);
             String mixMobile = mixMobile(phone);
             t.setMobile(mixMobile);
+            t.setPhone(phone);
         });
         return new HospitalSaasUserResp(lists, count);
     }

server/src/main/resources/mybatis/AccountMapper.xml

@@ -355,6 +355,9 @@
             <if test="comment != null">
                 comment = #{comment,jdbcType=VARCHAR},
             </if>
+            <if test="comment == null">
+                comment = null,
+            </if>
             <if test="registerType != null">
                 register_type = #{registerType,jdbcType=INTEGER},
             </if>