feat：福本源会员列表备注和电话不加密

fs-company-app/src/main/java/com/fs/app/controller/FsUserController.java

@@ -90,6 +90,7 @@ public class FsUserController extends AppBaseController {
         log.debug("用户会员分页列表 param: {}", JSON.toJSONString(param));
         param.setUserId(Long.parseLong(getUserId()));
 //        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        param.setIsHidePhoneMiddle(false);
         PageInfo<FsUserPageListVO> fsUserPageListVOPageInfo = fsUserService.selectFsUserPageList(param);
 //        PageInfo<FsUserPageListVO> pageInfo = new PageInfo<>(list);
         return ResponseResult.ok(fsUserPageListVOPageInfo);

fs-service/src/main/java/com/fs/his/mapper/FsUserMapper.java

@@ -79,7 +79,7 @@ public interface FsUserMapper
      */
     public int deleteFsUserByUserIds(Long[] userIds);
     @Select({"<script> " +
-                "select f1.*,f2.nick_name tui_name,f2.phone tui_phone,cu.nick_name AS companyUserNickName,co.company_name FROM fs_user f1 LEFT JOIN fs_user f2 ON f1.tui_user_id =f2.user_id "+
+                "select f1.*, ifnull(cuc.remark, f1.remark) as remark, f2.nick_name tui_name,f2.phone tui_phone,cu.nick_name AS companyUserNickName,co.company_name FROM fs_user f1 LEFT JOIN fs_user f2 ON f1.tui_user_id =f2.user_id "+
             " LEFT JOIN fs_user_company_user cuc ON cuc.user_id = f1.user_id\n" +
             " LEFT JOIN company_user cu ON cu.user_id = cuc.company_user_id\n" +
             " LEFT JOIN company co ON co.company_id = cuc.company_id "+

fs-service/src/main/java/com/fs/his/service/impl/FsUserServiceImpl.java

@@ -90,8 +90,7 @@ import com.fs.his.service.IFsUserService;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import static com.fs.his.utils.PhoneUtil.decryptPhoneMk;
-import static com.fs.his.utils.PhoneUtil.encryptPhone;
+import static com.fs.his.utils.PhoneUtil.*;
 import static com.fs.hisStore.enums.BillDetailEnum.CATEGORY_1;
 import static com.fs.hisStore.enums.BillDetailEnum.CATEGORY_3;
 
@@ -584,11 +583,16 @@ public class FsUserServiceImpl implements IFsUserService
 
             //解密
             if(fsUserPageListVO.getPhone() != null && fsUserPageListVO.getPhone() != ""){
-                if (fsUserPageListVO.getPhone().length()>11){
-                    fsUserPageListVO.setPhone(decryptPhoneMk(fsUserPageListVO.getPhone()));
-                }else {
-                    fsUserPageListVO.setPhone(fsUserPageListVO.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+                if(param.getIsHidePhoneMiddle()){
+                    if (fsUserPageListVO.getPhone().length()>11){
+                        fsUserPageListVO.setPhone(decryptPhoneMk(fsUserPageListVO.getPhone()));
+                    }else {
+                        fsUserPageListVO.setPhone(fsUserPageListVO.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+                    }
+                } else {
+                    fsUserPageListVO.setPhone(decryptPhone(fsUserPageListVO.getPhone()));
                 }
+
             }
         }
 

fs-service/src/main/java/com/fs/store/param/h5/FsUserPageListParam.java

@@ -84,6 +84,10 @@ public class FsUserPageListParam implements Serializable {
 
     @ApiModelProperty(value = "状态 0小黑屋 1正常 2拉黑")
     private Integer status;
+    /**
+     * 电话是否隐藏中间部分
+     */
+    private Boolean isHidePhoneMiddle = Boolean.TRUE;
 
 
 }

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -227,7 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         fs_user_company_user.is_repeat_fans,
         fs_user_company_user.project_id,
         fs_user_company_user.`status`,
-        fs_user_company_user.remark,
+        ifnull(fs_user_company_user.remark, fs_user.remark) as remark,
         fs_user_company_user.id as userCompanyUserId,
         fs_user_company_user.create_time
         FROM