jiangjiazhi / regional-platform

Authored by rui.zhang over 9 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 18 additions and 7 deletions

...	...	@@ -65,6 +65,15 @@
65	65	return;
66	66	}
67	67
	68	+ UsersQuery usersQuery = new UsersQuery();
	69	+ usersQuery.setYn(YnEnums.YES.getId());
	70	+ usersQuery.setDeptId(id);
	71	+ Integer count = usersService.queryUsersCount(usersQuery);
	72	+ if(0 < count) {
	73	+ ResultUtils.buildParameterErrorResultAndWrite(response, "部门/科室下有用户数据，不能删除");
	74	+ return;
	75	+ }
	76	+
68	77	departments.setYn(YnEnums.NO.getId());
69	78	departments.setModified(new Date());
70	79	departmentsService.updateDepartments(departments);

...	...	@@ -282,19 +282,21 @@
282	282	roles.setModified(new Date());
283	283	rolesService.updateRoles(roles);
284	284
285		- //中间表数据处理
	285	+
	286	+ //如果有数据不能删除
286	287	UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery();
287	288	userRoleMapsQuery.setRoleId(id);
288		- List<UserRoleMaps> userRoleMapses = userRoleMapsService.queryUserRoleMaps(userRoleMapsQuery);
289		- if (null != userRoleMapses) {
290		- for (UserRoleMaps userRoleMaps : userRoleMapses) {
291		- userRoleMaps.setYn(YnEnums.NO.getId());
292		- userRoleMapsService.updateUserRoleMaps(userRoleMaps);
293		- }
	289	+ userRoleMapsQuery.setYn(YnEnums.YES.getId());
	290	+ Integer count = userRoleMapsService.queryUserRoleMapsCount(userRoleMapsQuery);
	291	+ if(count > 0) {
	292	+ ResultUtils.buildParameterErrorResultAndWrite(response, "该角色下有用户数据，不能删除");
	293	+ return;
294	294	}
295	295
	296	+ //角色权限设置为无效
296	297	RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery();
297	298	rolePermissionMapsQuery.setRoleId(id);
	299	+ rolePermissionMapsQuery.setYn(YnEnums.YES.getId());
298	300	List<RolePermissionMaps> rolePermissionMapsList = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery);
299	301	if (null != rolePermissionMapsList) {
300	302	for (RolePermissionMaps rolePermissionMaps : rolePermissionMapsList) {