|
|
@@ -589,10 +589,10 @@ public class CompanyUserController extends BaseController {
|
|
|
Map<String,Object> params = new HashMap<>();
|
|
|
params.put("nickName", name);
|
|
|
//查询多条数据传入公司
|
|
|
- if (pageSize>=200){
|
|
|
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
|
|
|
- params.put("companyId", loginUser.getCompany().getCompanyId());
|
|
|
- }
|
|
|
+// if (pageSize>=200){
|
|
|
+ LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
|
|
|
+ params.put("companyId", loginUser.getCompany().getCompanyId());
|
|
|
+// }
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
List<OptionsVO> companyUserList = companyUserService.selectCompanyUserListByMap(params);
|
|
|
return R.ok().put("data", new PageInfo<>(companyUserList));
|
|
|
@@ -613,10 +613,10 @@ public class CompanyUserController extends BaseController {
|
|
|
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
|
|
|
|
|
|
//查询多条数据传入公司
|
|
|
- if (pageSize>=200){
|
|
|
+// if (pageSize>=200){
|
|
|
|
|
|
- params.put("companyId", loginUser.getCompany().getCompanyId());
|
|
|
- }
|
|
|
+ params.put("companyId", loginUser.getCompany().getCompanyId());
|
|
|
+// }
|
|
|
List<Long> combinedDeptList = new ArrayList<>();
|
|
|
//本部门
|
|
|
Long deptId = loginUser.getUser().getDeptId();
|