修改

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -33,6 +33,8 @@ import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
 import com.jeeplus.modules.sg.picking.activiti.entity.PickList;
 import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
 import com.jeeplus.modules.sg.picking.activiti.service.PickIngService;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.SystemService;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.RuntimeService;
@@ -113,6 +115,9 @@ public class ActTaskController extends BaseController {
 	@Autowired
 	private PickIngService pickIngService;
 
+	@Autowired
+	private SystemService systemService;
+
 	/**
 	 * 获取待办列表
 	 * @return
@@ -903,12 +908,14 @@ public class ActTaskController extends BaseController {
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
+		User user1 = systemService.getUserByLoginName(user.getProjectManageRole());
 		OaNotify  oaNotify = new OaNotify();
 		oaNotify.setType("1");
 		oaNotify.setTitle("施工交底结束");
 		oaNotify.setContent("施工交底结束");
 		oaNotify.setStatus("1");
-		oaNotify.setOaNotifyRecordIds("9fcadb62979e4ceab459867b37bf04bc");
+		oaNotify.setOaNotifyRecordIds(user1.getId());
 		oaNotifyService.save(oaNotify);
 		List<OaNotifyRecord> list = oaNotify.getOaNotifyRecordList();
 		for(OaNotifyRecord o : list){
@@ -917,7 +924,7 @@ public class ActTaskController extends BaseController {
 					.getBean(ServletContext.class);
 			new SystemInfoSocketHandler().sendMessageToUser(UserUtils.get(o.getUser().getId()).getLoginName(), "收到一条新通知，请到我的通知查看！");
 		}
-		j.setMsg("审批成功;已经通知项目经理，施工单位");
+		j.setMsg("审批成功;已经通知"+user.getProjectManageRole());
 		return j;
 	}
 

src/main/java/com/jeeplus/modules/sys/web/FileController.java

@@ -316,7 +316,7 @@ public class FileController extends BaseController {
 		String fileUrl = Global.getAttachmentUrl2()+uploadPath+"/"+year+"/"+month+"/";
 		String fileDir = Global.getAttachmentDir2()+uploadPath+"/"+year+"/"+month+"/";
 		// 判断文件是否为空
-		if (!file.isEmpty()) {c
+		if (!file.isEmpty()) {
 			// 文件保存路径
 			// 转存文件
 			FileUtils.createDirectory(fileDir);