Merge remote-tracking branch 'origin/master'

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

@@ -241,10 +241,10 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 			office.setId(workContractInfo.getChargeCompany());
         }else{
         	//无合同
-			WorkClientLinkman workClientLinkman = projectRecords.getWorkClientLinkmanList().get(0);
-			workClientInfo = workClientInfoService.get(workClientLinkman.getClientId());
-			company.setId(workClientInfo.getCompanyId());
-			office.setId(workClientInfo.getOfficeId());
+//			WorkClientLinkman workClientLinkman = projectRecords.getWorkClientLinkmanList().get(0);
+//			workClientInfo = workClientInfoService.get(workClientLinkman.getClientId());
+			company.setId(UserUtils.getUser().getComId());
+			office.setId(UserUtils.getUser().getOffice().getId());
 		}
 		projectRecords.setCompany(company);
 		projectRecords.setOffice(office);

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectRecordsController.java

@@ -445,7 +445,7 @@ public class ProjectRecordsController extends BaseController {
 	@RequestMapping("saveAudit")
 	public String saveAudit(ProjectRecords projectRecords, Model model,
 							@RequestParam(value = "upload_files", required = false) MultipartFile[] upload_files,
-							RedirectAttributes redirectAttributes) {
+							RedirectAttributes redirectAttributes)  {
 		String home = projectRecords.getHome();
 		try {
 			String taskDefKey = projectRecords.getAct().getTaskDefKey();