Merge remote-tracking branch 'origin/master'

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

@@ -147,12 +147,17 @@ public class AdvanceController extends BaseController {
 		vars.put("pass", false);
 		String loginName = UserUtils.getUser().getLoginName();
 		//配网政策处理专职
-		String s = constructionService.nameFindOffice(loginName);
-
-		if ("施工经理".equals(s)) {
+		List<String> strings = constructionService.nameFindOffice(loginName);
+		boolean flag = false;
+		for (String a :strings) {
+			if ("施工经理".equals(a)) {
+				flag = true;
+			}
+		}
+		if (flag) {
 			vars.put("noPass", true);
-			Project user = MyActiviUtils.findUser(pickApplication.getAct().getProcInsId());
-			vars.put("manager", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
+			Project project = projectService.get(pickApplication.getProjectId());
+			vars.put("manager", UserUtils.getByUserName(project.getProjectManageRole()).getLoginName());
 			j.setMsg("发起流程审批成功!");
 		}else {
 			vars.put("pass", true);

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

@@ -29,7 +29,7 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
     /**
      * 根据登陆名查询角色
      * */
-    String nameFindOffice(String loginName);
+    List<String> nameFindOffice(String loginName);
 
     void newSave(Construction construction);
 

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

@@ -227,7 +227,7 @@
 	</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 in (select role_id from sys_user_role where user_id = (SELECT id from sys_user where login_name = #{loginName}))
 	</select>
 
 	<insert id="newSave">

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/service/ConstructionService.java

@@ -74,7 +74,7 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 	/**
 	 * 根据登陆名查询角色
 	 * */
-	public String nameFindOffice(String loginName) {
+	public List<String> nameFindOffice(String loginName) {
 		return constructionMapper.nameFindOffice(loginName);
 	}
 

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/ConstructionController.java

@@ -347,7 +347,7 @@ public class ConstructionController extends BaseController {
                 if ("施工单位自行交底".equals(constructionUnit)) {
                     //施工单位交底
                     //获取施工单位角色
-                    constructionUnitRole = each.getConstructionUnitRole();
+                    constructionUnitRole = each.getConstructionUnitManage();
                     //查询是否有此登录名用户
                     User user = constructionService.queryPerson(constructionUnitRole);
                     //如果查询不为空表示有用户，为空没有此用户

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

@@ -460,8 +460,14 @@ public class PickIngController extends BaseController {
         vars.put("full", false);
         String loginName = UserUtils.getUser().getLoginName();
         //配网政策处理专职
-        String s = constructionService.nameFindOffice(loginName);
-        if ("配网政策处理专职".equals(s)) {
+        List<String> strings = constructionService.nameFindOffice(loginName);
+        boolean flag = false;
+        for (String a :strings) {
+            if ("配网政策处理专职".equals(a)) {
+                flag = true;
+            }
+        }
+        if (flag) {
             vars.put("full", true);
             Project project = projectService.get(pickApplication.getProjectId());
             vars.put("manager", UserUtils.getByUserName(project.getProjectManageRole()).getLoginName());