xs %!s(int64=5) %!d(string=hai) anos
pai
achega
67c65bbe6d

+ 1 - 2
src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/ProjectMapper.xml

@@ -476,8 +476,7 @@
 			station_dtu = #{stationDtu}
 		WHERE id = #{id}
 	</update>
-	
-	
+
 	<!--物理删除-->
 	<update id="delete">
 		DELETE FROM xm_project_details

+ 43 - 21
src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -188,31 +188,53 @@ public class ProjectController extends BaseController {
 		}
 		List<Project> projects = new ArrayList<Project>();
 		projects.add(project);
+		//获取登录名
+		User userByLoginName = systemService.getUserByLoginName(UserUtils.getUser().getLoginName());
+		String judgeRole = ProExcelInfo.getJudgeRole(userByLoginName);
+		if (judgeRole.equals("2")){
+			j.setSuccess(false);
+			j.setMsg("操作失败:您还没有操作的权限,如果需要请联系管理员!");
+			return j;
+		}
 		String loginName = UserUtils.getUser().getLoginName();
 		List<String> allUser = projectService.findAllUser();
-		String judgeValue1 = ProExcelInfo.getJudgeValue(projects,allUser);
-		String judgeValue2 = ProExcelInfo.getJudgeValueManager(projects);
-		String judgeValue = judgeValue1+judgeValue2;
-		if (project.getIsNewRecord()){
-			if (!"".equals(judgeValue)||!project.getProjectManageRole().equals(loginName)){
-				j.setSuccess(false);
-				j.setMsg("新建失败:"+judgeValue+"数据不符合规范");
-				return j;
+		if ("0".equals(judgeRole)){
+			String judgeValue = ProExcelInfo.getJudgeValue(projects,allUser);
+			if (project.getIsNewRecord()){
+				if (!"".equals(judgeValue)||!project.getDistributionEngineering().equals(loginName)){
+					j.setSuccess(false);
+					j.setMsg("新建失败:"+judgeValue+"数据不符合规范");
+					return j;
+				}
+				projectService.saveList(projects);
+				j.setSuccess(true);
+				j.setMsg("保存需求基本信息成功");
+			}else{
+				if (!"".equals(judgeValue)||!project.getDistributionEngineering().equals(loginName)){
+					j.setSuccess(false);
+					j.setMsg("修改失败:"+judgeValue+"数据不符合规范");
+					return j;
+				}
+				projectService.saveList(projects);
+				j.setSuccess(true);
+				j.setMsg("修改需求基本信息成功");
 			}
-			project.preInsert();
-			projectService.saveList(projects);
-			j.setSuccess(true);
-			j.setMsg("保存需求基本信息成功");
-		}else{
-			if (!"".equals(judgeValue)||!project.getProjectManageRole().equals(loginName)){
-				j.setSuccess(false);
-				j.setMsg("修改失败:"+judgeValue+"数据不符合规范");
-				return j;
+		}else {
+			String judgeValue = ProExcelInfo.getJudgeValueManager(projects);
+			if (project.getIsNewRecord()){
+				j.setSuccess(true);
+				j.setMsg("保存需求基本信息成功");
+			}else{
+				if (!"".equals(judgeValue)||!project.getProjectManageRole().equals(loginName)){
+					j.setSuccess(false);
+					j.setMsg("修改失败:"+judgeValue+"数据不符合规范");
+					return j;
+				}
+				project.preUpdate();
+				projectService.save(project);
+				j.setSuccess(true);
+				j.setMsg("修改需求基本信息成功");
 			}
-			project.preUpdate();
-			projectService.save(project);
-			j.setSuccess(true);
-			j.setMsg("修改需求基本信息成功");
 		}
 		return j;
 	}

+ 1 - 1
src/main/java/com/jeeplus/modules/sys/service/SystemService.java

@@ -251,7 +251,7 @@ public class SystemService extends BaseService implements InitializingBean {
 	public List<Role> findAllRole(){
 		return UserUtils.getRoleList();
 	}
-	
+
 	@Transactional(readOnly = false)
 	public void saveRole(Role role) {
 		if (StringUtils.isBlank(role.getId())){