|
@@ -31,6 +31,7 @@ import com.persagy.common.utils.ResponseUtil;
|
|
|
import com.persagy.common.utils.StringUtil;
|
|
|
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
|
|
|
/**
|
|
|
* 工作历主表
|
|
@@ -67,10 +68,9 @@ public class WorkCalendarController {
|
|
|
}
|
|
|
|
|
|
if (StringUtil.isNotBlank(queryVO.getObjId()) && StringUtil.isBlank(queryVO.getId())) {
|
|
|
- QueryWrapper<WorkCalendarObject> queryWrapper = new WorkCalendarObject.Builder().createQueryWrapper()
|
|
|
- .groupCodeEq(queryVO.getGroupCode()).projectIdEq(queryVO.getProjectId())
|
|
|
- .objectIdEq(queryVO.getObjId()).builderQueryWrapper();
|
|
|
- WorkCalendarObject calendarObject = this.workCalendarObjectService.getOne(queryWrapper);
|
|
|
+ WorkCalendarObject calendarObject = this.workCalendarObjectService.lambdaQuery().eq(StrUtil.isNotBlank(queryVO.getGroupCode()), WorkCalendarObject::getGroupCode, queryVO.getGroupCode())
|
|
|
+ .eq(StrUtil.isNotBlank(queryVO.getProjectId()), WorkCalendarObject::getProjectId, queryVO.getProjectId())
|
|
|
+ .eq(StrUtil.isNotBlank(queryVO.getObjId()), WorkCalendarObject::getObjectId, queryVO.getObjId()).one();
|
|
|
if (calendarObject == null) {
|
|
|
return ResponseUtil.successResult(Lists.newArrayList());
|
|
|
}
|