|
@@ -4,19 +4,18 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.map.MapUtil;
|
|
|
import cn.hutool.core.text.StrFormatter;
|
|
|
-import cn.hutool.core.util.ArrayUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.persagy.dmp.basic.constant.DigitalMessageConstant;
|
|
|
import com.persagy.dmp.common.constant.CommonConstant;
|
|
|
import com.persagy.dmp.common.constant.ValidEnum;
|
|
|
import com.persagy.dmp.common.context.AppContext;
|
|
|
import com.persagy.dmp.common.exception.BusinessException;
|
|
|
import com.persagy.dmp.common.model.entity.BaseEntity;
|
|
|
import com.persagy.dmp.define.entity.ObjectInfoDefine;
|
|
|
-import com.persagy.dmp.basic.constant.DigitalMessageConstant;
|
|
|
import com.persagy.dmp.rwd.basic.utils.DigitalMessageHelper;
|
|
|
import com.persagy.dmp.rwd.define.dao.ObjectInfoMapper;
|
|
|
import com.persagy.dmp.rwd.define.service.IObjectInfoService;
|
|
@@ -203,10 +202,7 @@ public class ObjectInfoServiceImpl implements IObjectInfoService {
|
|
|
wrapper.select("*");
|
|
|
}
|
|
|
List<String> projectIds = CollUtil.newArrayList(CommonConstant.DEFAULT_ID, AppContext.getContext().getGroupCode(), projectId);
|
|
|
- if(CollUtil.isNotEmpty(classCodes)) {
|
|
|
- wrapper.lambda().in(ObjectInfoDefine::getClassCode, ArrayUtil.toArray(classCodes, String.class));
|
|
|
- }
|
|
|
- return dao.queryByClassCodes(projectIds, wrapper);
|
|
|
+ return dao.queryByClassCodes(projectIds, classCodes, wrapper);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -231,7 +227,7 @@ public class ObjectInfoServiceImpl implements IObjectInfoService {
|
|
|
}
|
|
|
List<String> projectIds = CollUtil.newArrayList(CommonConstant.DEFAULT_ID, AppContext.getContext().getGroupCode(), projectId);
|
|
|
wrapper = ensureCollectWrapper(wrapper, projectIds);
|
|
|
- return dao.queryCollectReport(projectIds, wrapper);
|
|
|
+ return dao.queryCollectReport(projectIds, null, wrapper);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -241,7 +237,7 @@ public class ObjectInfoServiceImpl implements IObjectInfoService {
|
|
|
}
|
|
|
List<String> projectIds = CollUtil.newArrayList(CommonConstant.DEFAULT_ID, AppContext.getContext().getGroupCode(), projectId);
|
|
|
wrapper = ensureCollectWrapper(wrapper, projectIds);
|
|
|
- return dao.queryCollectInfos(projectIds, wrapper);
|
|
|
+ return dao.queryCollectInfos(projectIds, null, wrapper);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -251,7 +247,7 @@ public class ObjectInfoServiceImpl implements IObjectInfoService {
|
|
|
}
|
|
|
List<String> projectIds = CollUtil.newArrayList(CommonConstant.DEFAULT_ID, AppContext.getContext().getGroupCode(), projectId);
|
|
|
wrapper = ensureCollectWrapper(wrapper, projectIds);
|
|
|
- return dao.queryCollectInfos(pageable, projectIds, wrapper);
|
|
|
+ return dao.queryCollectInfos(pageable, projectIds, null, wrapper);
|
|
|
}
|
|
|
|
|
|
/**
|