Commit bbb93ef428fc3f615cef369fcbbdb6cbb3664e31

Authored by changpengfei
1 parent 6550d827d8
Exists in master and in 1 other branch dev

bug

Showing 5 changed files with 3 additions and 33 deletions

talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java View file @ bbb93ef
... ... @@ -205,10 +205,10 @@
205 205 BaseResponse baseResponse=new BaseResponse();
206 206 String[] ridArr=rids.split(",");
207 207  
208   - int cnt=lymsUserService.delUserByRole(uid);//删除用户角色关系
  208 + int cnt=lymsUserroleService.delRoleByUser(uid);//删除用户角色关系
209 209  
210 210 for (int i = 0; i < ridArr.length; i++) {
211   - cnt=lymsUserService.addUserAndRole(uid,Integer.parseInt(ridArr[i]));
  211 + cnt=lymsUserroleService.addRoleUser(uid,Integer.parseInt(ridArr[i]));
212 212 }
213 213  
214 214 return baseResponse;
talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsUserMapper.java View file @ bbb93ef
... ... @@ -16,12 +16,5 @@
16 16  
17 17 @Select("select * from lyms_user where login=#{login} and passwd=#{passwd} ")
18 18 public List<LymsUser> sltUser(@Param("login") String login, @Param("passwd") String passwd);
19   -
20   -
21   - @Delete("delete FROM lyms_userrole WHERE uid=#{uid}")
22   - int delUserByRole(@Param("uid") int uid);
23   -
24   - @Insert("insert into lyms_userrole(uid,rid) values(#{uid},#{rid})")
25   - int addUserAndRole(int uid, int rid);
26 19 }
talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsUserroleMapper.java View file @ bbb93ef
... ... @@ -14,7 +14,7 @@
14 14 @Delete("delete from lyms_userrole where uid=#{uid}")
15 15 int delRoleByUser(@Param("uid") int uid);
16 16  
17   - @Insert(("insert into lyms_userrole(uid,rid) values(#{rid},#{rid})"))
  17 + @Insert(("insert into lyms_userrole(uid,rid) values(#{uid},#{rid})"))
18 18 int addRoleUser(@Param("uid") int uid,@Param("rid") int rid);
19 19 }
talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsUserService.java View file @ bbb93ef
... ... @@ -16,19 +16,5 @@
16 16  
17 17 LymsUser getUserByToken(String token);
18 18  
19   - /**
20   - * 删除用户关联的角色
21   - * @param uid
22   - * @return
23   - */
24   - int delUserByRole(int uid);
25   -
26   - /**
27   - * 添加用户关联的角色
28   - * @param uid
29   - * @param rid
30   - * @return
31   - */
32   - int addUserAndRole(int uid, int rid);
33 19 }
talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsUserServiceImpl.java View file @ bbb93ef
... ... @@ -93,14 +93,5 @@
93 93 return uLst.size()>0?uLst.get(0):null;
94 94 }
95 95  
96   - @Override
97   - public int delUserByRole(int uid) {
98   - return lymsUserMapper.delUserByRole(uid);
99   - }
100   -
101   - @Override
102   - public int addUserAndRole(int uid, int rid) {
103   - return lymsUserMapper.addUserAndRole(uid,rid);
104   - }
105 96 }