From 8a5dc30e6baf040aec2fc95fd82529f66db6a088 Mon Sep 17 00:00:00 2001
From: changpengfei <changpengfei@lymsh.com>
Date: Wed, 8 Sep 2021 17:49:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../talkonlineweb/controller/UserContoller.java     | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java
index 7202808..f506e4c 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java
@@ -8,10 +8,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lyms.talkonlineweb.annotation.TokenRequired;
 import com.lyms.talkonlineweb.domain.LymsPermission;
 import com.lyms.talkonlineweb.domain.LymsUser;
+import com.lyms.talkonlineweb.domain.UserroleInfo;
 import com.lyms.talkonlineweb.mapper.LymsUserMapper;
 import com.lyms.talkonlineweb.result.BaseResponse;
 import com.lyms.talkonlineweb.result.CheckResult;
 import com.lyms.talkonlineweb.service.LymsUserService;
+import com.lyms.talkonlineweb.service.UserroleInfoService;
 import com.lyms.talkonlineweb.util.Constant;
 import com.lyms.talkonlineweb.util.HXService;
 import com.lyms.talkonlineweb.util.JwtUtils;
@@ -43,6 +45,9 @@ public class UserContoller {
     @Autowired
     private HXService hxService;
 
+    @Autowired
+    private UserroleInfoService userroleInfoService;//视图
+
     @Value("${hx.APPKEY}")
     private String appKey;
     @Value("${hx.ClientID}")
@@ -205,4 +210,20 @@ public class UserContoller {
         return baseResponse;
     }
 
+    /**
+     * 获取用户和角色列表
+     * @param user
+     * @param current
+     * @param size
+     * @return
+     */
+    @GetMapping("getUserRoleLst")
+    public BaseResponse getUserRoleLst(UserroleInfo user, int current, int size){
+        BaseResponse baseResponse=new BaseResponse();
+        Page<UserroleInfo> page=new Page<>(current,size);
+        Page<UserroleInfo> userIPage=userroleInfoService.page(page,Wrappers.query(user).orderByDesc("updated_time","createdtime"));
+        baseResponse.setObject(userIPage);
+        return baseResponse;
+    }
+
 }
-- 
1.8.3.1