|
|
@@ -7,7 +7,10 @@ import com.google.common.collect.Lists;
|
|
|
import com.jeeplus.common.config.Global;
|
|
|
import com.jeeplus.common.oss.OSSClientUtil;
|
|
|
import com.jeeplus.common.persistence.Page;
|
|
|
-import com.jeeplus.common.utils.*;
|
|
|
+import com.jeeplus.common.utils.DateUtils;
|
|
|
+import com.jeeplus.common.utils.MyBeanUtils;
|
|
|
+import com.jeeplus.common.utils.StringUtils;
|
|
|
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
|
|
|
import com.jeeplus.common.utils.excel.ExportExcel;
|
|
|
import com.jeeplus.common.utils.excel.ImportExcel;
|
|
|
import com.jeeplus.common.web.BaseController;
|
|
|
@@ -15,7 +18,6 @@ import com.jeeplus.modules.act.entity.Act;
|
|
|
import com.jeeplus.modules.act.service.ActTaskService;
|
|
|
import com.jeeplus.modules.act.utils.ActUtils;
|
|
|
import com.jeeplus.modules.hr.service.UserInfoService;
|
|
|
-import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
|
|
|
import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
|
|
|
import com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo;
|
|
|
import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
|
|
|
@@ -291,7 +293,9 @@ public class RuralCostProjectRecordsController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
//根据审核人id获取审核人
|
|
|
- projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
|
|
|
+ if(StringUtils.isNotBlank(projectRecords.getReviewerPersonId())){
|
|
|
+ projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
|
|
|
+ }
|
|
|
} else {
|
|
|
projectRecords.setCreateBy(UserUtils.getUser());
|
|
|
projectRecords.setCreateDate(new Date());
|
user5