Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/advence/activiti/web/AdvanceController.java

@@ -18,6 +18,7 @@ import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.sg.advence.activiti.entity.Advance;
 import com.jeeplus.modules.sg.advence.activiti.service.AdvanceService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
+import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
 import com.jeeplus.modules.sg.managementcenter.project.util.ImportUtil;
@@ -150,7 +151,8 @@ public class AdvanceController extends BaseController {
 
 		if ("施工经理".equals(s)) {
 			vars.put("noPass", true);
-			vars.put("manager", "项目经理A");
+			Project user = MyActiviUtils.findUser(pickApplication.getAct().getProcInsId());
+			vars.put("manager", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
 			j.setMsg("发起流程审批成功!");
 		}else {
 			vars.put("pass", true);

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/ConstructionMapper.xml

@@ -222,11 +222,11 @@
 	</select>
 
 	<select id="queryPerson" resultType="com.jeeplus.modules.sys.entity.User">
-		SELECT	* FROM sys_user where login_name = #{loginName}
+		SELECT	* FROM sys_user where name = #{loginName}
 	</select>
 
 	<select id="nameFindOffice" resultType="string">
-		select name from sys_role where id =(select role_id from sys_user_role where user_id = (SELECT id from sys_user where login_name = #{loginName}))
+		select name from sys_role where id =(select role_id from sys_user_role where user_id = (SELECT id from sys_user where name = #{loginName}))
 	</select>
 
 	<insert id="newSave">

src/main/java/com/jeeplus/modules/sg/picking/activiti/web/PickIngController.java

@@ -442,7 +442,8 @@ public class PickIngController extends BaseController {
         String s = constructionService.nameFindOffice(loginName);
         if ("配网政策处理专职".equals(s)) {
             vars.put("full", true);
-            vars.put("manager", "项目经理A");
+            Project user = MyActiviUtils.findUser(pickApplication.getAct().getProcInsId());
+            vars.put("manager", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
             j.setMsg("发起流程审批成功!");
         }else {
             showListService.projectUpdate(pickApplication);