ソースを参照

组织画像-查获模块

chenshudong 3 ヶ月 前
コミット
96c81fef8a
共有1 個のファイルを変更した3 個の追加2 個の削除を含む
  1. 3 2
      airport-item/src/main/java/com/sundot/airport/item/service/impl/UserRankingServiceImpl.java

+ 3 - 2
airport-item/src/main/java/com/sundot/airport/item/service/impl/UserRankingServiceImpl.java

@@ -235,10 +235,10 @@ public class UserRankingServiceImpl implements UserRankingService {
235 235
         Long brigadeId = findBrigadeIdByUser(user);
236 236
         List<SysUser> brigadeIdUsers = new ArrayList<>();
237 237
         if (brigadeId != null) {
238
-            stationUsers = sysUserService.selectUserListByRoleKeyAndDeptId(
238
+            brigadeIdUsers = sysUserService.selectUserListByRoleKeyAndDeptId(
239 239
                     Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()),
240 240
                     brigadeId);
241
-            if (CollectionUtil.isEmpty(stationUsers)) {
241
+            if (CollectionUtil.isEmpty(brigadeIdUsers)) {
242 242
                 return null;
243 243
             }
244 244
         }
@@ -250,6 +250,7 @@ public class UserRankingServiceImpl implements UserRankingService {
250 250
             case "brigade":
251 251
                 // 查询大队下所有用户
252 252
                 users.addAll(brigadeIdUsers);
253
+                dto.setInspectBrigadeId(brigadeId);
253 254
                 return itemLargeScreenMapper.rankByIndividual(dto);
254 255
             case "department":
255 256
                 if (RoleTypeEnum.banzuzhang.getCode().equals(sysRole.getRoleKey()) ||