Преглед на файлове

修改
平台账户查询

hgw преди 3 години
родител
ревизия
e8f4a17161
променени са 1 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 4 4
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

+ 4 - 4
mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

@@ -251,15 +251,15 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
             for (EmployeeDto employeeDto : dataList) {
                 employeeDto.setPositionIds(positionMap.get(employeeDto.getId()));
                 employeeDto.setPositionNames(positionNameMap.get(employeeDto.getId()));
+                //平台账户查询所拥有的机构
+                if(Objects.nonNull(queryInfo.getTenantId()) && queryInfo.getTenantId() == -1){
+                    employeeDto.setUserTenantList(sysUserTenantService.queryUserTenant(employeeDto.getId()));
+                }
                 if (StringUtils.isBlank(employeeDto.getOrganIdStr())) {
                     continue;
                 }
                 List<Integer> organIds = Arrays.stream(employeeDto.getOrganIdStr().split(",")).map(s -> Integer.valueOf(s)).collect(Collectors.toList());
                 allOrganIds.addAll(organIds);
-                //平台账户查询所拥有的机构
-                if(Objects.nonNull(queryInfo.getTenantId()) && queryInfo.getTenantId() == -1){
-                    employeeDto.setUserTenantList(sysUserTenantService.queryUserTenant(employeeDto.getId()));
-                }
             }
             if (!CollectionUtils.isEmpty(allOrganIds)) {
                 List<Organization> allOrgans = organizationDao.findOrgans(allOrganIds);