測試

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecords.java

@@ -72,7 +72,7 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	private List<WorkClientLinkman> workConstructionLinkmanList;		// 施工方及联系人
 	@NotBlank(message = "工程概况不能为空")
 	private String projectDesc;		// 工程概况
-	@NotNull(message = "项目负责人不能为空")
+	/*@NotNull(message = "项目负责人不能为空")*/
 	private List<User> projectLeaders; //项目负责人
 
 	private List<User> projectMembers;  //项目组成员

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -278,7 +278,10 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
         }
 		//保存项目负责人
 		List<User> leaders = projectRecords.getProjectLeaders();
-		this.saveProjectUsers(projectRecords.getId(), leaders, true);
+        if(null!=leaders&&leaders.size()>0){
+			this.saveProjectUsers(projectRecords.getId(), leaders, true);
+		}
+
 		//保存委托方联系人
 		List<WorkClientLinkman> workClientLinkmanList = projectRecords.getWorkClientLinkmanList();
 		this.saveLinkmanInfos(projectRecords.getId(), workClientLinkmanList, true);
@@ -576,7 +579,16 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 
     @Transactional(readOnly = false)
     public String auditSave(ProjectRecords projectRecords,List<User> auditUsers) throws Exception {
-		int projectStatus = projectRecords.getProjectStatus();
+
+		//保存项目负责人(新添代码start)
+		List<User> lds = projectRecords.getProjectLeaders();
+		User user2=new User();
+		if(null!=lds&&lds.size()>0){
+			this.saveProjectUsers(projectRecords.getId(), lds, true);
+			user2.setId(lds.get(0).getId());
+		}
+		//(end)
+    	int projectStatus = projectRecords.getProjectStatus();
 		String taskDefKey = projectRecords.getAct().getTaskDefKey();
 		if (!"modifyApply".equals(taskDefKey) && !taskDefKey.contains("audit") ) {
 			actTaskService.claim(projectRecords.getAct().getTaskId(), UserUtils.getUser().getId());
@@ -733,10 +745,12 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 				notify.setNotifyId(projectRecords.getId());
 				userList = workProjectNotifyService.readByNotifyId(notify);
 				users.add(projectRecords.getCreateBy());
+
 				workProjectNotifyService
 						.save(UtilNotify
 								.saveNotify(projectRecords.getId(),
-										projectRecords.getCreateBy(),
+										/*projectRecords.getCreateBy(),*/
+										user2,
 										projectRecords.getCompany().getId(),
 										titleStr,
 										notifyStr,