|
@@ -346,11 +346,16 @@ public class UserService extends ServiceImpl<UserMapper,UserEntity> {
|
|
|
LoginUser currentUser = UserUtil.getCurrentUser();
|
|
|
Integer compayId = currentUser.getCompanyId();
|
|
|
Integer deptId = currentUser.getDepartmentId();
|
|
|
- compayId = 262;
|
|
|
String ids = "";
|
|
|
if (deptId != null)
|
|
|
ids = orgMapper.findParentOrgByChildId(deptId);
|
|
|
- List<UserEntity> list = userMapper.findUserIdsForOrg(compayId, deptId, ids);
|
|
|
+ List<Long> idList = new ArrayList<>();
|
|
|
+ String[] as = ids.split(",");
|
|
|
+ for(String item : as)
|
|
|
+ {
|
|
|
+ idList.add(Long.valueOf(item));
|
|
|
+ }
|
|
|
+ List<UserEntity> list = userMapper.findUserIdsForOrg(compayId, deptId, idList);
|
|
|
return list;
|
|
|
}
|
|
|
public List<Integer> findUserIdsByPermissonOrg(String tenantId,Integer companyOrgId,Integer deptOrgId){
|