Ver Fonte

feature: searhcable in查询bug修改

mazq há 1 ano atrás
pai
commit
7526af4859

+ 3 - 0
dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/business/impl/DataAuthBusiness.java

@@ -742,6 +742,9 @@ public class DataAuthBusiness implements IDataAuthBusiness {
 
     // 获取表数据
     private List<AppDataResourceInfoRespVO> getTableByIds(Collection<String> tableIds) {
+        if (CollectionUtils.isEmpty(tableIds)) {
+            return Collections.emptyList();
+        }
         Searchable searchable = Searchable.newSearchable();
         searchable.addSearchFilter("id", SearchOperator.in, tableIds);
         return appDataResourceInfoFacade.searchList(searchable.toSearchDTO());

+ 1 - 1
dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/business/impl/ServiceAuthBusinessImpl.java

@@ -302,7 +302,7 @@ public class ServiceAuthBusinessImpl implements IServiceAuthBusiness {
         workFlowSearchable.addSearchFilter("applyType", SearchOperator.eq, flowType);
         workFlowSearchable.addSearchFilter("deleted", SearchOperator.eq, BooleanEnum.FALSE.getValue());
         List<WorkFlow> workFlows = workFlowService.search(workFlowSearchable);
-        if (workFlows == null || workFlows.size() == 0) {
+        if (CollectionUtils.isEmpty(workFlows)) {
             return null;
         }
         List<String> applyingWorkFlowIds = workFlows.stream().map(WorkFlow::getId).collect(Collectors.toList());

+ 6 - 0
dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/service/impl/AppFunInfoService.java

@@ -334,6 +334,9 @@ public class AppFunInfoService implements IAppFunInfoService {
 
     @Override
     public List<AppFunInfo> getByAppIds(List<String> appIds) {
+        if (CollectionUtils.isEmpty(appIds)) {
+            return Collections.emptyList();
+        }
         Searchable searchable = Searchable.newSearchable();
         searchable.addSearchFilter("app_id", SearchOperator.in, appIds);
         searchable.addSearchFilter("is_active", SearchOperator.eq, BooleanEnum.TRUE.getValue());
@@ -555,6 +558,9 @@ public class AppFunInfoService implements IAppFunInfoService {
 
     @Override
     public List<AppFunInfoDTO> getByIds(List<String> funIds) {
+        if (CollectionUtils.isEmpty(funIds)) {
+            return Collections.emptyList();
+        }
         Searchable searchable = Searchable.newSearchable();
         searchable.addSearchFilter("id", SearchOperator.in, funIds);
         searchable.addSearchFilter("is_active", SearchOperator.eq, BooleanEnum.TRUE.value);

+ 1 - 1
dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/service/impl/ServiceAuthResultServiceImpl.java

@@ -503,7 +503,7 @@ public class ServiceAuthResultServiceImpl implements IServiceAuthResultService {
         Searchable workFlowSearchable = Searchable.newSearchable();
         workFlowSearchable.addSearchFilter("flowId", SearchOperator.in, flowIds);
         List<WorkFlow> workFlows = workFlowService.search(workFlowSearchable);
-        if (workFlows == null || workFlows.size() == 0) {
+        if (CollectionUtils.isEmpty(workFlows)) {
             return;
         }
         Map<String, WorkFlow> workFlowMap = workFlows.stream()