From b853f785a41e247fe797d0dfe2b6673dc9f61462 Mon Sep 17 00:00:00 2001
From: Silliter <sliter.yuan@estsh.com>
Date: Tue, 19 Mar 2019 13:30:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=EF=BC=8C=E8=A7=92=E8=89=B2=E5=BE=AE=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/busi/PersonnelController.java           | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
index 051f433..c3cbe84 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.EncryptTool;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
@@ -13,6 +14,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
 import cn.estsh.i3plus.pojo.model.platform.UserDetailPagerModel;
+import cn.estsh.i3plus.pojo.model.platform.UserRolePagerModel;
 import cn.estsh.i3plus.pojo.platform.bean.*;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
@@ -51,6 +53,9 @@ public class PersonnelController  extends CoreBaseController {
     @Autowired
     private ISysFileService fileService;
 
+    @Autowired
+    private ISysRoleService sysRoleService;
+
     @PostMapping(value="/user-detail/insert")
     @ApiOperation(value="添加用户信息",notes="返回内容添加用户信息")
     public ResultBean insertUserDetailModel(UserDetailModel model) {
@@ -463,6 +468,19 @@ public class PersonnelController  extends CoreBaseController {
         }
     }
 
+    @PostMapping(value = "/role/get-role-list")
+    @ApiOperation(value = "根据条件分页查询用户角色信息", notes = "根据条件分页查询用户角色信息")
+    public ResultBean queryPagerByRoleInfo(@RequestBody UserRolePagerModel model){
+        try {
+            ListPager<SysRole> listPager = sysRoleService.querySysRole(model.getSysRole(), model.getPager());
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(listPager);
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
+
     /**
      * 数据必填校验
      * @param model