|
@@ -3,6 +3,7 @@ package com.fs.company.service.impl;
|
|
|
import cn.hutool.core.collection.ListUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
import com.fs.common.BeanCopyUtils;
|
|
|
import com.fs.common.QRutils;
|
|
|
import com.fs.common.annotation.DataScope;
|
|
@@ -22,10 +23,7 @@ import com.fs.company.mapper.*;
|
|
|
import com.fs.company.param.CompanyUserAreaParam;
|
|
|
import com.fs.company.param.CompanyUserCodeParam;
|
|
|
import com.fs.company.param.CompanyUserQwParam;
|
|
|
-import com.fs.company.service.ICompanyRoleService;
|
|
|
-import com.fs.company.service.ICompanyService;
|
|
|
-import com.fs.company.service.ICompanyUserRoleService;
|
|
|
-import com.fs.company.service.ICompanyUserService;
|
|
|
+import com.fs.company.service.*;
|
|
|
import com.fs.company.vo.*;
|
|
|
import com.fs.course.service.IFsUserCompanyUserService;
|
|
|
import com.fs.his.mapper.FsUserMapper;
|
|
@@ -45,8 +43,11 @@ import com.fs.qw.service.IQwUserService;
|
|
|
import com.fs.qw.vo.CompanyUserQwVO;
|
|
|
import com.fs.qw.vo.QwOptionsVO;
|
|
|
import com.fs.qw.vo.QwUserVO;
|
|
|
+import com.fs.system.domain.SysConfig;
|
|
|
+import com.fs.system.mapper.SysConfigMapper;
|
|
|
import com.fs.system.oss.CloudStorageService;
|
|
|
import com.fs.system.oss.OSSFactory;
|
|
|
+import com.fs.system.service.ISysConfigService;
|
|
|
import com.fs.system.service.ISysRoleService;
|
|
|
import com.fs.system.service.ISysUserService;
|
|
|
import com.fs.voice.utils.StringUtil;
|
|
@@ -104,6 +105,7 @@ public class CompanyUserServiceImpl implements ICompanyUserService
|
|
|
|
|
|
@Autowired
|
|
|
private FsUserMapper fsUserMapper;
|
|
|
+
|
|
|
@Autowired
|
|
|
private IFsUserCompanyUserService userCompanyUserService;
|
|
|
|
|
@@ -119,6 +121,9 @@ public class CompanyUserServiceImpl implements ICompanyUserService
|
|
|
@Autowired
|
|
|
private ISysRoleService sysRoleService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ICompanyConfigService companyConfigService;
|
|
|
+
|
|
|
// @Autowired
|
|
|
// private ICompanyUserRoleService userRoleService;
|
|
|
|
|
@@ -660,7 +665,20 @@ public class CompanyUserServiceImpl implements ICompanyUserService
|
|
|
@Override
|
|
|
@DataScope(deptAlias = "u", userAlias = "u")
|
|
|
public List<CompanyUserQwListVO> selectCompanyUserQwListVO(CompanyUserQwParam user) {
|
|
|
- return companyUserMapper.selectCompanyUserQwListVO(user);
|
|
|
+ CompanyConfig companyConfig = companyConfigService.selectCompanyConfigByKey(user.getCompanyId(), "company:admin:show");
|
|
|
+ boolean isAdminShow = false;
|
|
|
+ if(!StringUtils.isEmpty(companyConfig.getConfigValue())){
|
|
|
+ isAdminShow = Boolean.parseBoolean(companyConfig.getConfigValue());
|
|
|
+ }
|
|
|
+ List<CompanyUserQwListVO> companyUserQwListVOS = companyUserMapper.selectCompanyUserQwListVO(user);
|
|
|
+ if(!isAdminShow){
|
|
|
+ Company company = companyService.selectCompanyById(user.getCompanyId());
|
|
|
+ Long userId = company.getUserId();
|
|
|
+ companyUserQwListVOS = companyUserQwListVOS.stream()
|
|
|
+ .filter(vo -> !vo.getUserId().equals(userId))
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ }
|
|
|
+ return companyUserQwListVOS;
|
|
|
}
|
|
|
|
|
|
@Override
|