|
@@ -39,9 +39,9 @@ public class FusionService implements IFusionService {
|
|
throw new BusinessException(LoginConstant.FAILURE_CODE_3015,LoginConstant.FAILURE_MSG_3015);
|
|
throw new BusinessException(LoginConstant.FAILURE_CODE_3015,LoginConstant.FAILURE_MSG_3015);
|
|
}
|
|
}
|
|
List<Integer> resourceList = new ArrayList<>();
|
|
List<Integer> resourceList = new ArrayList<>();
|
|
- if(param.getType() == 0){
|
|
|
|
|
|
+ if(param.getType()!= null && param.getType() == 0){
|
|
resourceList = Arrays.asList(1,2,12,13,14);
|
|
resourceList = Arrays.asList(1,2,12,13,14);
|
|
- }else if(param.getType() == 1){
|
|
|
|
|
|
+ }else if(param.getType()!= null && param.getType() == 1){
|
|
resourceList = Collections.singletonList(3);
|
|
resourceList = Collections.singletonList(3);
|
|
}
|
|
}
|
|
LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
|