fix bug

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/service/impl/ManageInfoService.java

@@ -289,6 +289,11 @@ public class ManageInfoService implements IManageInfoService {
         Page<AuthUserInfo> userInfoPage = manageInfoRepository.getManageUserInfo(searchable);
         List<AuthUserInfo> userInfos = userInfoPage.getContent();
         List<AuthUserDTO> collect = userInfos.stream().map(e -> {
+            //  TODO-Lvzr：过滤ADMIN数据，暂时写死，是否需要支持动态过滤
+            String name = e.getName();
+            if (org.springframework.util.StringUtils.hasText(name) && "ADMIN".equalsIgnoreCase(name)) {
+                return null;
+            }
             AuthUserDTO dto = new AuthUserDTO();
             BeanUtils.copyProperties(e, dto);
             final String code;
@@ -302,7 +307,7 @@ public class ManageInfoService implements IManageInfoService {
             }
             dto.setPoliceCategory(value);
             return dto;
-        }).collect(Collectors.toList());
+        }).filter(el-> el != null).collect(Collectors.toList());
         return new PageImpl<>(collect, searchable.getPage(), userInfoPage.getTotalElements());
     }
 

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/business/impl/LabelBusiness.java

@@ -122,16 +122,16 @@ public class LabelBusiness implements ILabelBusiness {
         showAllSearchParam.setOperator(SearchOperator.eq.name());
         showAllSearchParam.setValue(showAll);
         filters.put("showAll", showAllSearchParam);
-        if(!showAll) {
+//        if(!showAll) {
             String idcard = currentUser.getIdcard();
             if(StringUtils.isBlank(idcard)) {
                 return null;
             }
-            SearchParam searchParam = new SearchParam();
-            searchParam.setOperator(SearchOperator.eq.name());
-            searchParam.setValue(idcard);
-            filters.put("idcard", searchParam);
-        }
+            SearchParam idcardParms = new SearchParam();
+            idcardParms.setOperator(SearchOperator.eq.name());
+            idcardParms.setValue(idcard);
+            filters.put("idcard", idcardParms);
+//        }
         String name = labelSearchDTO.getName();
         if(StringUtils.isNotBlank(name)) {
             SearchParam searchParam = new SearchParam();