|
@@ -494,7 +494,7 @@ public class AppFunInfoService extends BaseService<AppFunInfo, String> implement
|
|
|
Condition funCodeIn = searchable.getSearchFilter("funCode", SearchOperator.in);
|
|
|
Condition funCodeEq = searchable.getSearchFilter("funCode", SearchOperator.eq);
|
|
|
if(null == appCodeIn && null == appCodeEq) {
|
|
|
- return ResponseDTO.fail(ResponseStatus.FAIL_CODE, "appCode conditon is null", null);
|
|
|
+ return ResponseDTO.fail(ResponseStatus.FAIL_CODE, "appCode condition is null", null);
|
|
|
}
|
|
|
List<String> appCodes = new ArrayList<>();
|
|
|
if(null != appCodeIn) {
|
|
@@ -507,7 +507,7 @@ public class AppFunInfoService extends BaseService<AppFunInfo, String> implement
|
|
|
searchable.removeSearchFilter("appCode", SearchOperator.eq);
|
|
|
}
|
|
|
if(CollectionUtils.isEmpty(appCodes)) {
|
|
|
- return ResponseDTO.success("success", new ArrayList<>());
|
|
|
+ return ResponseDTO.fail("appCode condition is null", new ArrayList<>());
|
|
|
}
|
|
|
if(null != funCodeIn) {
|
|
|
List<String> list = (List<String>) funCodeIn.getValue();
|
|
@@ -521,6 +521,9 @@ public class AppFunInfoService extends BaseService<AppFunInfo, String> implement
|
|
|
}
|
|
|
|
|
|
List<ApplyInfo> applyInfos = applyInfoFacade.getListByCodes(appCodes);
|
|
|
+ if(CollectionUtils.isEmpty(applyInfos)) {
|
|
|
+ return ResponseDTO.success("success", new ArrayList<>());
|
|
|
+ }
|
|
|
Map<String, ApplyInfo> applyInfoMap = applyInfos
|
|
|
.stream()
|
|
|
.collect(Collectors.toMap(ApplyInfo::getId, item -> item));
|