jiangjiazhi / regional-platform

Authored by rui.zhang over 9 years ago

Exists in master and in 8 other branches

部门 角色 修改时名称唯一

Showing 2 changed files with 21 additions and 2 deletions

...	...	@@ -93,8 +93,16 @@
93	93	ResultUtils.buildParameterErrorResultAndWrite(response,"该部门不存在");
94	94	return;
95	95	}
	96	+ if(!departments.getName().equals(name)) {
	97	+ DepartmentsQuery departmentsQuery = new DepartmentsQuery();
	98	+ departments.setYn(YnEnums.YES.getId());
	99	+ departmentsQuery.setName(name);
	100	+ if(0 < departmentsService.queryDepartmentsCount(departmentsQuery)) {
	101	+ ResultUtils.buildParameterErrorResultAndWrite(response,"该部门已存在");
	102	+ return;
	103	+ }
	104	+ }
96	105
97		-
98	106	pid = pid == null ? 0 : pid;
99	107	departments.setParentId(pid);
100	108	departments.setName(name);
...	...	@@ -137,6 +145,7 @@
137	145	}
138	146	DepartmentsQuery departmentsQuery = new DepartmentsQuery();
139	147	departmentsQuery.setName(name);
	148	+ departmentsQuery.setYn(YnEnums.YES.getId());
140	149	if(0 < departmentsService.queryDepartmentsCount(departmentsQuery)) {
141	150	ResultUtils.buildParameterErrorResultAndWrite(response,"该部门已存在");
142	151	return;

...	...	@@ -235,8 +235,18 @@
235	235	}
236	236	Roles roles = rolesService.getRoles(id);
237	237	if (roles==null){
238		- new BusinessException("", "根据id获取信息不存在.");
	238	+ new BusinessException("", "角色信息不存在.");
239	239	return;
	240	+ }
	241	+
	242	+ if(!roles.getName().equals(name)) {
	243	+ RolesQuery rolesQuery = new RolesQuery();
	244	+ rolesQuery.setYn(YnEnums.YES.getId());
	245	+ rolesQuery.setName(name);
	246	+ if(0 < rolesService.queryRolesCount(rolesQuery)) {
	247	+ ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.NAME_EXIST, "角色名称已存在");
	248	+ return;
	249	+ }
240	250	}
241	251
242	252	roles.setName(name);