|
@@ -25,10 +25,8 @@ import org.jeecg.common.util.RedisUtil;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
import org.jeecg.modules.ctop.entity.ProjectMember;
|
|
import org.jeecg.modules.ctop.entity.ProjectMember;
|
|
import org.jeecg.modules.ctop.service.IProjectMemberService;
|
|
import org.jeecg.modules.ctop.service.IProjectMemberService;
|
|
-import org.jeecg.modules.system.entity.SysDepart;
|
|
|
|
-import org.jeecg.modules.system.entity.SysUser;
|
|
|
|
-import org.jeecg.modules.system.entity.SysUserDepart;
|
|
|
|
-import org.jeecg.modules.system.entity.SysUserRole;
|
|
|
|
|
|
+import org.jeecg.modules.system.entity.*;
|
|
|
|
+import org.jeecg.modules.system.mapper.UserCompanyMapper;
|
|
import org.jeecg.modules.system.model.DepartIdModel;
|
|
import org.jeecg.modules.system.model.DepartIdModel;
|
|
import org.jeecg.modules.system.model.SysUserDepartsVO;
|
|
import org.jeecg.modules.system.model.SysUserDepartsVO;
|
|
import org.jeecg.modules.system.service.*;
|
|
import org.jeecg.modules.system.service.*;
|
|
@@ -105,25 +103,28 @@ public class SysUserController {
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private UserCompanyMapper userCompanyMapper;
|
|
|
|
|
|
@RequestMapping(value = "/getAllUserListByCompany", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/getAllUserListByCompany", method = RequestMethod.GET)
|
|
- public Result<List<SysUserVo>> getAllUserListByCompany(String userId) {
|
|
|
|
|
|
+ public Result<List<SysUserVo>> getAllUserListByCompany() {
|
|
Result<List<SysUserVo>> result = new Result<>();
|
|
Result<List<SysUserVo>> result = new Result<>();
|
|
try {
|
|
try {
|
|
- /*List<SysUserVo> userList = new ArrayList<>();
|
|
|
|
- String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
|
|
|
|
- if (!"admin".equals(roleCode)) {
|
|
|
|
- QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
|
|
|
|
- userCompanyQueryWrapper.eq("user_id", userId);
|
|
|
|
- userCompanyQueryWrapper.orderByDesc("create_time");
|
|
|
|
- userCompanyQueryWrapper.last("limit 1");
|
|
|
|
- UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
|
|
|
|
- userList = sysUserService.getUserListByCompany(userCompany.getCompanyId());
|
|
|
|
- } else {
|
|
|
|
|
|
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+ QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ userCompanyQueryWrapper.eq("user_id", user.getId());
|
|
|
|
+ userCompanyQueryWrapper.orderByDesc("create_time");
|
|
|
|
+ userCompanyQueryWrapper.last("limit 1");
|
|
|
|
+ UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
|
|
|
|
+ String companyId = userCompany.getCompanyId();
|
|
|
|
+ List<SysUserVo> userList;
|
|
|
|
+ if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
|
|
userList = sysUserService.getAllUser();
|
|
userList = sysUserService.getAllUser();
|
|
|
|
+ } else {
|
|
|
|
+ userList = sysUserService.getUserListByCompany(companyId);
|
|
}
|
|
}
|
|
-*/
|
|
|
|
- List<SysUserVo> userList = sysUserService.getAllUser();
|
|
|
|
|
|
+
|
|
|
|
+
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
result.setResult(userList);
|
|
result.setResult(userList);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -140,7 +141,19 @@ public class SysUserController {
|
|
public Result<List<SysUserVo>> getAllList() {
|
|
public Result<List<SysUserVo>> getAllList() {
|
|
Result<List<SysUserVo>> result = new Result<>();
|
|
Result<List<SysUserVo>> result = new Result<>();
|
|
try {
|
|
try {
|
|
- List<SysUserVo> userList = sysUserService.getAllUser();
|
|
|
|
|
|
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+ QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ userCompanyQueryWrapper.eq("user_id", user.getId());
|
|
|
|
+ userCompanyQueryWrapper.orderByDesc("create_time");
|
|
|
|
+ userCompanyQueryWrapper.last("limit 1");
|
|
|
|
+ UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
|
|
|
|
+ String companyId = userCompany.getCompanyId();
|
|
|
|
+ List<SysUserVo> userList;
|
|
|
|
+ if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
|
|
|
|
+ userList = sysUserService.getAllUser();
|
|
|
|
+ } else {
|
|
|
|
+ userList = sysUserService.getUserListByCompany(companyId);
|
|
|
|
+ }
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
result.setResult(userList);
|
|
result.setResult(userList);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -155,7 +168,21 @@ public class SysUserController {
|
|
public Result<List<SysUserVo>> getSaleList() {
|
|
public Result<List<SysUserVo>> getSaleList() {
|
|
Result<List<SysUserVo>> result = new Result<>();
|
|
Result<List<SysUserVo>> result = new Result<>();
|
|
try {
|
|
try {
|
|
- List<SysUserVo> userList = sysUserService.getAllSales();
|
|
|
|
|
|
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+ List<SysUserVo> userList;
|
|
|
|
+ QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ userCompanyQueryWrapper.eq("user_id", user.getId());
|
|
|
|
+ userCompanyQueryWrapper.orderByDesc("create_time");
|
|
|
|
+ userCompanyQueryWrapper.last("limit 1");
|
|
|
|
+ UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
|
|
|
|
+ String companyId = userCompany.getCompanyId();
|
|
|
|
+ if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
|
|
|
|
+ userList = sysUserService.getAllSales();
|
|
|
|
+ } else {
|
|
|
|
+ userList = sysUserService.getAllSalesByCompanyId(companyId);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
result.setResult(userList);
|
|
result.setResult(userList);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|