diff --git a/ruoyi-ui/src/api/system/user.js b/ruoyi-ui/src/api/system/user.js index b01c499d8..5ab7b12b9 100644 --- a/ruoyi-ui/src/api/system/user.js +++ b/ruoyi-ui/src/api/system/user.js @@ -10,6 +10,15 @@ export function listUser(query) { }) } +// 查询用户列表 +export function listlrrUser(query) { + return request({ + url: '/system/user/lrrlist', + method: 'get', + params: query + }) +} + // 查询用户详细 export function getUser(userId) { return request({ diff --git a/ruoyi-ui/src/views/benyi/customer/index.vue b/ruoyi-ui/src/views/benyi/customer/index.vue index d08d23699..53da2dc6f 100644 --- a/ruoyi-ui/src/views/benyi/customer/index.vue +++ b/ruoyi-ui/src/views/benyi/customer/index.vue @@ -70,6 +70,21 @@ + + + + + + + { + this.lrrOptions = response.rows; + }); + }, /** 根据roleid查询用户列表 */ getUsersByRole() { getUserOnlyByRoleId(this.roleId).then((response) => { @@ -880,7 +906,7 @@ export default { const id = row.id || this.ids; getCustomer(id).then((response) => { this.form = response.data; - if (response.data.sheng == null) { + if (response.data.sheng == null) { this.diglogForm.province = ""; } else { this.diglogForm.province = response.data.sheng; @@ -908,7 +934,7 @@ export default { // this.diglogForm.province = response.data.sheng; // this.diglogForm.city = response.data.shi; // this.diglogForm.area = response.data.quxian; - if (response.data.sheng == null) { + if (response.data.sheng == null) { this.diglogForm.province = ""; } else { this.diglogForm.province = response.data.sheng; diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java index af7dcd623..d4fa69b35 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java @@ -74,6 +74,23 @@ public class SysUserController extends BaseController { return getDataTable(list); } + @GetMapping("/lrrlist") + public TableDataInfo lrrlist(SysUser user) { + int l1=103; + user.setDeptId(Long.valueOf(l1)); + List list = userService.selectUserList(user); + + int l2=105; + user.setDeptId(Long.valueOf(l2)); + list.addAll(userService.selectUserList(user)); + + int l3=107; + user.setDeptId(Long.valueOf(l3)); + list.addAll(userService.selectUserList(user)); + + return getDataTable(list); + } + @Log(title = "用户管理", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:user:export')") @GetMapping("/export")