|
@@ -22,6 +22,7 @@ import org.springblade.core.mp.support.Query;
|
|
|
import org.springblade.core.secure.BladeUser;
|
|
|
import org.springblade.core.secure.utils.SecureUtil;
|
|
|
import org.springblade.core.tool.utils.BeanUtil;
|
|
|
+import org.springblade.core.tool.utils.CollectionUtil;
|
|
|
import org.springblade.core.tool.utils.StringUtil;
|
|
|
import org.springframework.beans.BeansException;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -179,12 +180,14 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, St
|
|
|
standardInfoJoinDTO.setLeftId(leftId);
|
|
|
leftIds.add(leftId);
|
|
|
List<StandardInfoConditionVo> standardInfos = standardInfoJoin.getStandardInfos();
|
|
|
- for (StandardInfoConditionVo standardInfo : standardInfos) {
|
|
|
- StandardInfoGroupNameVO standardInfoGroupNameVO = standardInfo.getStandardInfoGroupNameVO();
|
|
|
- List<Long> ids = standardInfoGroupNameVO.getIds();
|
|
|
- standardInfoJoinDTO.getRightIds().addAll(ids);
|
|
|
+ if (CollectionUtil.isNotEmpty(standardInfos)) {
|
|
|
+ for (StandardInfoConditionVo standardInfo : standardInfos) {
|
|
|
+ StandardInfoGroupNameVO standardInfoGroupNameVO = standardInfo.getStandardInfoGroupNameVO();
|
|
|
+ List<Long> ids = standardInfoGroupNameVO.getIds();
|
|
|
+ standardInfoJoinDTO.getRightIds().addAll(ids);
|
|
|
+ }
|
|
|
+ list.add(standardInfoJoinDTO);
|
|
|
}
|
|
|
- list.add(standardInfoJoinDTO);
|
|
|
}
|
|
|
|
|
|
//封装参数
|