项目无合同登记

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

@@ -251,18 +251,18 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		WorkClientInfo workClientInfo = new WorkClientInfo();
 		Office company= new Office();
 		Office office =  new Office();
-		if (null != projectRecords.getWorkContractInfo()){
-			if(StringUtils.isNotBlank((projectRecords.getWorkContractInfo().getId()))){
+		if (null != projectRecords.getWorkContractInfo()) {
+			if (StringUtils.isNotBlank((projectRecords.getWorkContractInfo().getId()))) {
 				//有合同状态
 				workContractInfo = workContractInfoDao.get(projectRecords.getWorkContractInfo().getId());
 				company.setId(workContractInfo.getCompanyId());
-	//			office.setId(workContractInfo.getChargeCompany());
+				//			office.setId(workContractInfo.getChargeCompany());
+				office.setId(UserUtils.getUser().getOffice().getId());
+			} else {
+				//无合同
+				company.setId(UserUtils.getUser().getCompany().getId());
 				office.setId(UserUtils.getUser().getOffice().getId());
 			}
-		}else{
-        	//无合同
-			company.setId(UserUtils.getUser().getCompany().getId());
-			office.setId(UserUtils.getUser().getOffice().getId());
 		}
 		projectRecords.setCompany(company);
 		projectRecords.setOffice(office);