修改

src/main/java/com/jeeplus/modules/sg/managementcenter/project/service/ProjectService.java

@@ -126,7 +126,9 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 			project.setConstructionStatus(constructionStatus);
 			project.setWhetherCloseStatus(whetherCloseStatus);
 		}
-		projectMapper.insertList(projects);
+		if (null!=projects&&projects.size()>0){
+			projectMapper.insertList(projects);
+		}
 	}
 	//根据id查找项目
 	public List<Project> getListProject(List<Project> projects){

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ProExcelInfo.java

@@ -178,17 +178,12 @@ public  class ProExcelInfo {
                     break;
                 }
             }
-            if (null!=project.getProjectManageRole()){//项目经理角色
-                String loginName = UserUtils.getUser().getLoginName();
-                if (!loginName.equals(project.getProjectManageRole())){
-                    flag= true;
-                }else {
-                    flag = false;
-                }
-                if (flag){
-                    break;
-                }
-            }
+//            if (null!=project.getProjectManageRole()){//项目经理角色
+//                String loginName = UserUtils.getUser().getLoginName();
+//                if (!loginName.equals(project.getProjectManageRole())){
+//                    flag= true;
+//                }
+//            }
             if (null!=project.getClarificaitonType()){//交底类型
                 flag = getJudge(project.getClarificaitonType(),PRO_CLARIFICAITON);
                 if (flag){
@@ -337,40 +332,16 @@ public  class ProExcelInfo {
         }
         return  (machineId+String.format("%015d",hashCodeV));
     }
+    public static List<Project> getSureProjects(List<Project> projects){
+        String loginName = UserUtils.getUser().getLoginName();
+        for (int i = 0; i < projects.size(); i++) {
+            if (null!=projects.get(i).getProjectManageRole()){//项目经理角色
+                if (!loginName.equals(projects.get(i).getProjectManageRole())){
+                    projects.remove(i);
+                    i--;
+                }
+            }
+        }
+        return projects;
+    }
 }
-//            if (null!=project.getDistributionEngineering()){//配网工程专职角色
-//                    flag = false;
-//                    }
-//                    if (null!=project.getDistributionMaterials()){//配网物资专职角色
-//                    flag = false;
-//                    }
-//                    if (null!=project.getDistributionSystem()){//配网系统专职角色
-//                    flag = false;
-//                    }
-//                    if (null!=project.getDistributionPolicy()){//配网政策处理专职角色
-//                    flag = false;
-//                    }
-//                    if (null!=project.getManagementLeader()){//项目管理中心领导角色
-//                    flag = false;
-//                    }
-//                    if (null!=project.getRunUnit()){//运行单位
-//                    flag = false;
-//                    }
-//                    if (null!=project.getRunUnitRole()){//运行单位角色
-//                    flag = false;
-//                    }
-//                    if (null!=project.getThroughResearchRole()){//经研所角色
-//                    flag = false;
-//                    }
-//                    if (null!=project.getConstructionUnit()){//施工单位
-//                    flag = false;
-//                    }
-//                    if (null!=project.getConstructionUnitRole()){//施工单位:施工单位角色
-//                    flag = false;
-//                    }
-//                    if (null!=project.getDesignUnit()){//设计单位
-//                    flag = false;
-//                    }
-//                    if (null!=project.getDesignUnitRole()){//设计单位角色
-//                    flag = false;
-//                    }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -145,20 +145,26 @@ public class ProjectController extends BaseController {
 			j.setMsg(errMsg);
 			return j;
 		}
+		List<Project> projects = new ArrayList<Project>();
+		projects.add(project);
+		String loginName = UserUtils.getUser().getLoginName();
+		Boolean judgeValue = ProExcelInfo.getJudgeValue(projects);
 		if (project.getIsNewRecord()){
-			project.preInsert();
-			List<Project> projects = new ArrayList<Project>();
-			projects.add(project);
-			Boolean judgeValue = ProExcelInfo.getJudgeValue(projects);
-			if (judgeValue){
+			if (judgeValue||!project.getProjectManageRole().equals(loginName)){
 				j.setSuccess(false);
 				j.setMsg("新建失败：数据不符合规范");
 				return j;
 			}
+			project.preInsert();
 			projectService.saveList(projects);
 			j.setSuccess(true);
 			j.setMsg("保存需求基本信息成功");
 		}else{
+			if (judgeValue||!project.getProjectManageRole().equals(loginName)){
+				j.setSuccess(false);
+				j.setMsg("修改失败：数据不符合规范");
+				return j;
+			}
 			project.preUpdate();
 			projectService.save(project);
 			j.setSuccess(true);
@@ -257,9 +263,9 @@ public class ProjectController extends BaseController {
 	@ResponseBody
 	@RequiresPermissions("sg:managementcenter:project:import")
     @RequestMapping(value = "import")
-   	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request){
+   	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws Exception{
 		AjaxJson j = new AjaxJson();
-		try {
+//		try {
 			ImportUtil importUtil = new ImportUtil(file, 0, 0);
 			Boolean projectUtilFlag = ProExcelInfo.getProjectUtilFlag(importUtil);
 			if (projectUtilFlag){
@@ -267,7 +273,7 @@ public class ProjectController extends BaseController {
 				j.setMsg("表不符合规范");
 				return j;
 			}
-			List<Project> projects = ProExcelInfo.getProjectUtil(importUtil);
+			List<Project> projects =ProExcelInfo.getSureProjects(ProExcelInfo.getProjectUtil(importUtil));
 			Boolean judgeValue = ProExcelInfo.getJudgeValue(projects);
 			if (judgeValue){
 				j.setSuccess(false);
@@ -276,10 +282,10 @@ public class ProjectController extends BaseController {
 			}
 			projectService.saveList(projects);
 			j.setMsg( "已成功导入 "+projects.size()+" 条项目表单记录");
-		} catch (Exception e) {
-			j.setSuccess(false);
-			j.setMsg("导入需求基本信息表单失败！失败信息："+e.getMessage());
-		}
+//		} catch (Exception e) {
+//			j.setSuccess(false);
+//			j.setMsg("导入需求基本信息表单失败！失败信息："+e.getMessage());
+//		}
 		return j;
     }
 }