Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -2553,7 +2553,8 @@ public class ActTaskService extends BaseService {
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("pass", "yes".equals(act.getFlag())? true : false);
-		vars.put("manager","施工单位领导A");
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
+		vars.put("manager", UserUtils.getByUserName(user.getConstructionUnitLeader()).getLoginName());
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 
@@ -2594,7 +2595,10 @@ public class ActTaskService extends BaseService {
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("pass", "yes".equals(flag)? true : false);
-		vars.put("manager", "yes".equals(flag)? "施工物资专职A" : "施工项目经理A");
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
+		String loginName = UserUtils.getByUserName(user.getConstructionUnitRole()).getLoginName();
+		String loginName1 = UserUtils.getByUserName(user.getConstructionUnitManage()).getLoginName();
+		vars.put("manager", "yes".equals(flag)? loginName : loginName1);
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 
@@ -2614,7 +2618,10 @@ public class ActTaskService extends BaseService {
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("pass", "yes".equals(flag)? true : false);
-		vars.put("manager", "yes".equals(flag)? "项目经理A" : "施工单位领导A");
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
+		String loginName = UserUtils.getByUserName(user.getProjectManageRole()).getLoginName();
+		String loginName1 = UserUtils.getByUserName(user.getConstructionUnitLeader()).getLoginName();
+		vars.put("manager", "yes".equals(flag)? loginName : loginName1);
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 
@@ -2637,7 +2644,9 @@ public class ActTaskService extends BaseService {
 			showListService.updateManagerTime(act.getProcInsId());
 		}
 		vars.put("pass", "yes".equals(flag)? true : false);
-		vars.put("manager", "yes".equals(flag)? "" : "沈忱");
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
+		String loginName = UserUtils.getByUserName(user.getDistributionMaterials()).getLoginName();
+		vars.put("manager", "yes".equals(flag)? "" : loginName);
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 
@@ -2657,7 +2666,10 @@ public class ActTaskService extends BaseService {
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("pass", "yes".equals(flag)? true : false);
-		vars.put("manager", "yes".equals(flag)? "沈忱" : "项目经理A");
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
+		String loginName = UserUtils.getByUserName(user.getDistributionMaterials()).getLoginName();
+		String loginName1 = UserUtils.getByUserName(user.getProjectManageRole()).getLoginName();
+		vars.put("manager", "yes".equals(flag)? loginName : loginName1);
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 
@@ -2677,7 +2689,10 @@ public class ActTaskService extends BaseService {
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("pass", "yes".equals(flag)? true : false);
-		vars.put("manager", "yes".equals(flag)? "夏卫进" : "项目经理A");
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
+		String loginName = UserUtils.getByUserName(user.getManagementLeader()).getLoginName();
+		String loginName1 = UserUtils.getByUserName(user.getProjectManageRole()).getLoginName();
+		vars.put("manager", "yes".equals(flag)? loginName : loginName1);
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}