Browse Source

修改 api

魏熙美 6 years ago
parent
commit
bf9e891670

+ 2
- 4
CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java View File

@@ -105,11 +105,9 @@ public class UserController extends BaseController {
105 105
     })
106 106
     @RequestMapping(value = "/roomUserList", method = RequestMethod.GET)
107 107
     public ResponseBean accessTicket(HttpSession session){
108
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
109
-        Integer userId = userElement.getId();
110 108
         ResponseBean responseBean = new ResponseBean();
111
-        List<TaUser> taUserList = iTaUserService.getAllRoomUserList(userId);
112
-        responseBean.addSuccess(taUserList);
109
+        UserElement userElement = getUserElement(session);
110
+        responseBean = iTaUserService.getAllRoomUserList(userElement);
113 111
         return responseBean;
114 112
     }
115 113
     @ApiOperation(value = "修改用户名和性别和身份证", notes = "修改用户名和性别和身份证")

+ 2
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/ITaUserService.java View File

@@ -50,10 +50,10 @@ public interface ITaUserService {
50 50
 
51 51
     /**
52 52
      * 获取房屋成员列表
53
-     * @param parentId
53
+     * @param userElement
54 54
      * @return
55 55
      */
56
-    List<TaUser> getAllRoomUserList(Integer parentId);
56
+    ResponseBean getAllRoomUserList(UserElement userElement);
57 57
 
58 58
     /**
59 59
      * 修改用户

+ 5
- 3
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java View File

@@ -333,8 +333,9 @@ public class TaUserServiceImpl implements ITaUserService {
333 333
     }
334 334
 
335 335
     @Override
336
-    public List<TaUser> getAllRoomUserList(Integer parentId) {
337
-        List<TaUser> taUserList = taUserMapper.selectUserListByParentId(parentId);
336
+    public ResponseBean getAllRoomUserList(UserElement userElement) {
337
+        ResponseBean responseBean = new ResponseBean();
338
+        List<TaUser> taUserList = taUserMapper.selectUserListByParentId(userElement.getId());
338 339
         taUserList.stream().forEach(e->{
339 340
             // 角色
340 341
             TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(e.getId());
@@ -342,7 +343,8 @@ public class TaUserServiceImpl implements ITaUserService {
342 343
             e.setRole(taSysRole.getId());
343 344
         });
344 345
 
345
-        return taUserList;
346
+        responseBean.addSuccess(taUserList);
347
+        return responseBean;
346 348
     }
347 349
 
348 350
     @Transactional(rollbackFor = Exception.class)