撤回提交

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

@@ -296,30 +296,4 @@ public class FsUserController extends BaseController
         Boolean r = userCompanyUserService.batchUpdateUserProjectStatus(ids, 1);
         return ResponseResult.ok(r);
     }
-
-    /**
-     *医健宝需求，主要不给销售公司管理员权限，给相应用户，能查询到查个公司小黑屋会员
-     * **/
-    @PreAuthorize("@ss.hasPermi('users:user:darkRoomCompanyList')")
-    @GetMapping("/darkRoomCompanyList")
-    @ApiOperation("小黑屋")
-    public R darkRoomCompanyList(FsUserPageListParam param) {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-
-        if(!loginUser.getPermissions().stream().anyMatch(permission -> permission.equals("users:user:darkRoomCompanyList"))){
-            return R.error("操作失败，权限不足！");
-        }
-
-        //查看销售公司
-        param.setUserId(loginUser.getUser().getUserId());
-        if(StringUtils.isFullNumber(param.getKeyword()) && param.getKeyword().trim().length() == 11){
-            param.setKeyword(encryptPhone(param.getKeyword()));
-        }
-        PageInfo<FsUserPageListVO> fsUserPageListVOPageInfo = fsUserService.selectFsUserCompanyPageList(param);
-        Map<String, Object> map = new HashMap<String, Object>();
-        map.put("rows", fsUserPageListVOPageInfo.getList());
-        map.put("total", fsUserPageListVOPageInfo.getTotal());
-        return R.ok(map);
-    }
-
 }

fs-service/src/main/java/com/fs/his/service/IFsUserService.java

@@ -221,11 +221,4 @@ public interface IFsUserService
     void handleFsUserWx(FsUser user, LoginMaWxParam param, WxMaJscode2SessionResult session);
 
     R removeUser(Long id);
-
-    /***
-     * 获取小黑黑屋公司列表用户
-     * @param param 请求参数
-     * @return  PageInfo<FsUserPageListVO>
-     * **/
-    PageInfo<FsUserPageListVO> selectFsUserCompanyPageList(FsUserPageListParam param);
 }

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

@@ -1465,65 +1465,4 @@ public class FsUserServiceImpl implements IFsUserService {
         fsUserMapper.removeUser(id);
         return R.ok();
     }
-
-    @Override
-    public PageInfo<FsUserPageListVO> selectFsUserCompanyPageList(FsUserPageListParam param) {
-        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param.getUserId());
-
-        if(companyUser == null){
-            throw new ServiceException("操作失败，用户不存在！");
-        }
-
-        param.setUserId(0L);
-        param.setCompanyId(companyUser.getCompanyId());
-        //筛选问题
-        if (StringUtils.isNotBlank(param.getCompanyUserId())) {
-            param.setUserId(Long.valueOf(param.getCompanyUserId()));
-        }
-
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        if (param.getTagIds() != null && param.getTagIds().length > 0) {
-            boolean containsZero = Arrays.asList(param.getTagIds()).contains("0");
-            // 如果包含 "0"，则设置 isNullTag 为 true
-            System.out.println("是否包含 0：" + containsZero + "，参数：" + Arrays.toString(param.getTagIds()));
-            if (containsZero) {
-                param.setIsNullTag(true);
-            }
-        }
-        List<FsUserPageListVO> fsUserPageListVOS = fsUserMapper.selectFsUserPageList(param);
-
-
-        List<SysDictData> courseProject = dictDataMapper.selectDictDataByType("sys_course_project");
-        for (FsUserPageListVO fsUserPageListVO : fsUserPageListVOS) {
-            if (courseProject != null && !courseProject.isEmpty()) {
-                if (fsUserPageListVO.getProjectId() != null) {
-                    // 项目
-                    courseProject.stream()
-                            .filter(c -> c.getDictValue().equals(fsUserPageListVO.getProjectId().toString()))
-                            .findFirst()
-                            .ifPresent(c -> fsUserPageListVO.setProjectName(c.getDictLabel()));
-                }
-            }
-            if (StringUtils.isEmpty(fsUserPageListVO.getNickname())) {
-                fsUserPageListVO.setNickname("用户暂未授权昵称");
-            }
-
-            //解密
-            if(fsUserPageListVO.getPhone() != null && fsUserPageListVO.getPhone() != ""){
-                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()));
-                }
-
-            }
-        }
-
-        return new PageInfo<>(fsUserPageListVOS);
-    }
-
 }