jiangjiazhi / regional-platform

Commit c58ad0d339cfc27d74d8c09b333ad4d7372fd3aa

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

修改权限，角色重复的问题

Showing 5 changed files with 75 additions and 23 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UserRoleMapsMapper.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/UserRoleMapsService.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UserRoleMapsServiceImpl.java
platform-biz-service/src/main/resources/mainOrm/UserRoleMaps.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java

...	...	@@ -5,7 +5,21 @@
5	5
6	6	import java.util.List;
7	7
8		-public interface UserRoleMapsMapper {public void addUserRoleMaps(UserRoleMaps obj);public void updateUserRoleMaps(UserRoleMaps obj);public void deleteUserRoleMaps(Integer id);public UserRoleMaps getUserRoleMaps(Integer id);public int queryUserRoleMapsCount(UserRoleMapsQuery query);public List<UserRoleMaps> queryUserRoleMaps(UserRoleMapsQuery query);
	8	+public interface UserRoleMapsMapper {
	9	+
	10	+ public void addUserRoleMaps(UserRoleMaps obj);
	11	+
	12	+ public void updateUserRoleMaps(UserRoleMaps obj);
	13	+
	14	+ public void deleteUserRoleMaps(Integer id);
	15	+
	16	+ public UserRoleMaps getUserRoleMaps(Integer id);
	17	+
	18	+ public int queryUserRoleMapsCount(UserRoleMapsQuery query);
	19	+
	20	+ public List<UserRoleMaps> queryUserRoleMaps(UserRoleMapsQuery query);
	21	+
	22	+ public List<Integer> queryUserRoleList(UserRoleMapsQuery query);
9	23
10	24	}

...	...	@@ -5,7 +5,20 @@
5	5
6	6	import java.util.List;
7	7
8		-public interface UserRoleMapsService {public void addUserRoleMaps(UserRoleMaps obj);public void updateUserRoleMaps(UserRoleMaps obj);public void deleteUserRoleMaps(Integer id);public UserRoleMaps getUserRoleMaps(Integer id);public int queryUserRoleMapsCount(UserRoleMapsQuery query);public List<UserRoleMaps> queryUserRoleMaps(UserRoleMapsQuery query);
	8	+public interface UserRoleMapsService {
	9	+ public void addUserRoleMaps(UserRoleMaps obj);
	10	+
	11	+ public void updateUserRoleMaps(UserRoleMaps obj);
	12	+
	13	+ public void deleteUserRoleMaps(Integer id);
	14	+
	15	+ public UserRoleMaps getUserRoleMaps(Integer id);
	16	+
	17	+ public int queryUserRoleMapsCount(UserRoleMapsQuery query);
	18	+
	19	+ public List<UserRoleMaps> queryUserRoleMaps(UserRoleMapsQuery query);
	20	+
	21	+ public List<Integer> queryUserRoleList(UserRoleMapsQuery query);
9	22
10	23	}

...	...	@@ -7,27 +7,48 @@
7	7	import org.springframework.beans.factory.annotation.Autowired;
8	8	import org.springframework.stereotype.Service;
9	9
10		-import java.util.Date;
11	10	import java.util.List;
12	11
13	12	@Service
14	13	public class UserRoleMapsServiceImpl implements UserRoleMapsService {
15	14
16		-@Autowired
17		-private UserRoleMapsMapper userRoleMapsMapper;
	15	+ @Autowired
	16	+ private UserRoleMapsMapper userRoleMapsMapper;
18	17
19		-@Override
20		-public void addUserRoleMaps(UserRoleMaps obj){userRoleMapsMapper.addUserRoleMaps(obj);}
21		-@Override
22		-public void updateUserRoleMaps(UserRoleMaps obj){userRoleMapsMapper.updateUserRoleMaps(obj);}
23		-@Override
24		-public void deleteUserRoleMaps (Integer id){userRoleMapsMapper.deleteUserRoleMaps(id);}
25		-@Override
26		-public UserRoleMaps getUserRoleMaps (Integer id){return userRoleMapsMapper.getUserRoleMaps(id);}
27		-@Override
28		-public int queryUserRoleMapsCount (UserRoleMapsQuery query){return userRoleMapsMapper.queryUserRoleMapsCount(query);}
29		-@Override
30		-public List<UserRoleMaps> queryUserRoleMaps (UserRoleMapsQuery query){if (query.getNeed() != null) {query.mysqlBuild(userRoleMapsMapper.queryUserRoleMapsCount(query));}return userRoleMapsMapper.queryUserRoleMaps(query);}
	18	+ @Override
	19	+ public void addUserRoleMaps(UserRoleMaps obj) {
	20	+ userRoleMapsMapper.addUserRoleMaps(obj);
	21	+ }
	22	+
	23	+ @Override
	24	+ public void updateUserRoleMaps(UserRoleMaps obj) {
	25	+ userRoleMapsMapper.updateUserRoleMaps(obj);
	26	+ }
	27	+
	28	+ @Override
	29	+ public void deleteUserRoleMaps(Integer id) {
	30	+ userRoleMapsMapper.deleteUserRoleMaps(id);
	31	+ }
	32	+
	33	+ @Override
	34	+ public UserRoleMaps getUserRoleMaps(Integer id) {
	35	+ return userRoleMapsMapper.getUserRoleMaps(id);
	36	+ }
	37	+
	38	+ @Override
	39	+ public int queryUserRoleMapsCount(UserRoleMapsQuery query) {
	40	+ return userRoleMapsMapper.queryUserRoleMapsCount(query);
	41	+ }
	42	+ public List<Integer> queryUserRoleList(UserRoleMapsQuery query){
	43	+ return userRoleMapsMapper.queryUserRoleList(query);
	44	+ }
	45	+ @Override
	46	+ public List<UserRoleMaps> queryUserRoleMaps(UserRoleMapsQuery query) {
	47	+ if (query.getNeed() != null) {
	48	+ query.mysqlBuild(userRoleMapsMapper.queryUserRoleMapsCount(query));
	49	+ }
	50	+ return userRoleMapsMapper.queryUserRoleMaps(query);
	51	+ }
31	52
32	53	}

...	...	@@ -16,7 +16,11 @@
16	16	insert into user_role_maps (user_id,role_id,yn,expirTime) values (#{userId},#{roleId},#{yn},#{expirTime})
17	17	</insert>
18	18
19		-
	19	+<select id="queryUserRoleList" parameterType="com.lyms.platform.permission.model.UserRoleMaps" resultType="java.lang.Integer">
	20	+select DISTINCT role_id from user_role_maps
	21	+ <include refid="UserRoleMapsCondition" />
	22	+ <include refid="orderAndLimit" />
	23	+</select>
20	24
21	25	<update id="updateUserRoleMaps" parameterType="com.lyms.platform.permission.model.UserRoleMaps">
22	26	update user_role_maps <set><if test="userId != null and userId >= 0">

...	...	@@ -253,16 +253,16 @@
253	253	UserRoleMapsQuery query = new UserRoleMapsQuery();
254	254	query.setUserId(users.getId());
255	255	query.setYn(YnEnums.YES.getId());
256		- List<UserRoleMaps> userRoleMapses = userRoleMapsService.queryUserRoleMaps(query);
	256	+ List<Integer> userRoleMapses = userRoleMapsService.queryUserRoleList(query);
257	257	List<Roles> roles = new ArrayList<>();
258	258	List<Permissions> permissions = null;
259	259	RolePermissionMapsQuery rolePermissionMapsQuery ;
260		- for(UserRoleMaps roleMaps : userRoleMapses) {
261		- roles.add(rolesService.getRoles(roleMaps.getRoleId()));
	260	+ for(Integer roleMaps : userRoleMapses) {
	261	+ roles.add(rolesService.getRoles(roleMaps));
262	262
263	263	//获取角色权限信息
264	264	rolePermissionMapsQuery = new RolePermissionMapsQuery();
265		- rolePermissionMapsQuery.setRoleId(roleMaps.getRoleId());
	265	+ rolePermissionMapsQuery.setRoleId(roleMaps);
266	266	rolePermissionMapsQuery.setYn(YnEnums.YES.getId());
267	267	List<RolePermissionMaps> rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery);
268	268	for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) {