瀏覽代碼

fix:调整重粉的判断、总后台小黑屋加密显示电话

caoliqin 5 天之前
父節點
當前提交
64ed2f165a

+ 3 - 0
fs-admin/src/main/java/com/fs/store/controller/FsUserController.java

@@ -162,6 +162,9 @@ public class FsUserController extends BaseController
 //        startPage();
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
         PageInfo<FsUserPageListVO> fsUserPageListVOPageInfo = fsUserService.selectFsUserPageList(param);
+        for (FsUserPageListVO fsUserPageListVO : fsUserPageListVOPageInfo.getList()) {
+            fsUserPageListVO.setPhone(ParseUtils.parsePhone(fsUserPageListVO.getPhone()));
+        }
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("rows", fsUserPageListVOPageInfo.getList());
         map.put("total", fsUserPageListVOPageInfo.getList().size());

+ 2 - 0
fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -899,6 +899,7 @@ public class FsUserServiceImpl implements IFsUserService
     public void setRepeatFansTag(FsUserCourseBeMemberParam param) {
         Map<String, Object> map = new HashMap<>();
         map.put("tagName", "重粉");
+        map.put("companyId", param.getCompanyId());
         List<CompanyTag> companyTags = companyTagMapper.selectCompanyTagListByMap(map);
         Long tagId;
         if(companyTags == null || companyTags.isEmpty()){
@@ -914,6 +915,7 @@ public class FsUserServiceImpl implements IFsUserService
         CompanyTagUser companyTagUserParam = new CompanyTagUser();
         companyTagUserParam.setUserId(param.getUserId());
         companyTagUserParam.setTagIds(tagId.toString());
+        companyTagUserParam.setCompanyUserId(param.getCompanyUserId());
         List<CompanyTagUser> companyTagUsers = companyTagUserMapper.selectCompanyTagUserList(companyTagUserParam);
         if(companyTagUsers == null || companyTagUsers.isEmpty()){
             CompanyTagUser companyTagUser = new CompanyTagUser();