Merge remote-tracking branch 'origin/master'

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

@@ -1800,7 +1800,7 @@ public class ActTaskService extends BaseService {
 		} else {
 			//驳回到项目经理人工判断问题
 			Project user = MyActiviUtils.findUser(act.getProcInsId());
-				vars.put("processer",UserUtils.getByUserName(user.getProjectManageRole()));
+				vars.put("processer",UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
 		}
 //		vars.put("yes".equals(act.getFlag())?"operators":"processer",fullName);
 		vars.put("flagNo","yes".equals(act.getFlag())?false:true);
@@ -1847,9 +1847,9 @@ public class ActTaskService extends BaseService {
 		Map<String, Object> vars = Maps.newHashMap();
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
-			vars.put("systemfulltime", UserUtils.getByUserName(user.getDistributionSystem()));
+			vars.put("systemfulltime", UserUtils.getByUserName(user.getDistributionSystem()).getLoginName());
 		} else {
-			vars.put("itemClose",UserUtils.getByUserName(user.getDistributionEngineering()));
+			vars.put("itemClose",UserUtils.getByUserName(user.getDistributionEngineering()).getLoginName());
 		}
 //		vars.put("yes".equals(act.getFlag())?"systemfulltime":"itemClose","yes".equals(act.getFlag())?fullTime:fullTime);
 		vars.put("systemNo","yes".equals(act.getFlag())?false:true);
@@ -2063,11 +2063,11 @@ public class ActTaskService extends BaseService {
 		vars.put("sealNo", false);
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
-			vars.put("sealPerson",UserUtils.getByUserName(user.getDistributionPolicy()));
+			vars.put("sealPerson",UserUtils.getByUserName(user.getDistributionPolicy()).getLoginName());
 			act.setComment("[没有问题]"+act.getComment());
 			vars.put("sealYes", true);
 		} else {
-			vars.put("phasePerson",UserUtils.getByUserName(user.getProjectManageRole()));
+			vars.put("phasePerson",UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
 			act.setComment("[驳回]" + act.getComment());
 			vars.put("sealNo", true);
 		}
@@ -2093,7 +2093,7 @@ public class ActTaskService extends BaseService {
 			vars.put("receiptYes", true);
 		} else {
 			Project user = MyActiviUtils.findUser(act.getProcInsId());
-			vars.put("coveredPerson",UserUtils.getByUserName(user.getConstructionUnitRole()));
+			vars.put("coveredPerson",UserUtils.getByUserName(user.getConstructionUnitRole()).getLoginName());
 			act.setComment("[驳回]" + act.getComment());
 			vars.put("receiptNo", true);
 		}
@@ -2146,7 +2146,7 @@ public class ActTaskService extends BaseService {
 			vars.put("singleYes", true);
 		} else {
 			Project user = MyActiviUtils.findUser(act.getProcInsId());
-			vars.put("coveredPerson",UserUtils.getByUserName(user.getConstructionUnitRole()));
+			vars.put("coveredPerson",UserUtils.getByUserName(user.getConstructionUnitRole()).getLoginName());
 			act.setComment("[驳回]" + act.getComment());
 			vars.put("singleNo", true);
 		}
@@ -2173,7 +2173,7 @@ public class ActTaskService extends BaseService {
 			vars.put("policyYes", true);
 		} else {
 			Project user = MyActiviUtils.findUser(act.getProcInsId());
-			vars.put("coveredPerson",UserUtils.getByUserName(user.getConstructionUnitRole()));
+			vars.put("coveredPerson",UserUtils.getByUserName(user.getConstructionUnitRole()).getLoginName());
 			act.setComment("[驳回]" + act.getComment());
 			vars.put("singleNo", true);
 		}
@@ -2199,7 +2199,7 @@ public class ActTaskService extends BaseService {
             vars.put("finishYes", true);
         } else {
 			Project user = MyActiviUtils.findUser(act.getProcInsId());
-			vars.put("coveredPerson",UserUtils.get(user.getConstructionUnitRole()));
+			vars.put("coveredPerson",UserUtils.get(user.getConstructionUnitRole()).getLoginName());
             act.setComment(act.getComment());
             vars.put("finishNo", true);
         }

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

@@ -962,7 +962,7 @@ public class ActTaskController extends BaseController {
 			e.printStackTrace();
 		}
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
-		User user1 = systemService.getUserByLoginName(user.getProjectManageRole());
+		User user1 = UserUtils.getByUserName(user.getProjectManageRole());
 		OaNotify  oaNotify = new OaNotify();
 		oaNotify.setType("4");
 		oaNotify.setTitle("施工交底结束（项目关闭）");