From 4f832caae77f93293d5af6f5ddf1fc5706615221 Mon Sep 17 00:00:00 2001 From: liux <963924687@qq.com> Date: Sat, 23 Aug 2025 16:26:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/system/api/RemoteUserService.java | 2 ++ .../com/bonus/system/api/domain/SysUser.java | 18 ++++++++++++++++++ .../api/factory/RemoteUserFallbackFactory.java | 7 ++++++- .../system/controller/SysUserController.java | 15 +++++++++++++++ .../com/bonus/system/mapper/SysUserMapper.java | 2 ++ .../service/impl/SysUserServiceImpl.java | 11 ++++++++++- .../resources/mapper/system/SysUserMapper.xml | 5 ++++- 7 files changed, 57 insertions(+), 3 deletions(-) diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java index 54f044d..0337b55 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java @@ -31,6 +31,8 @@ public interface RemoteUserService { @GetMapping("/user/list}") public TableDataInfo list(SysUser user, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + @GetMapping("/user/list_all}") + public TableDataInfo listAll(SysUser user, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 通过用户名查询用户信息 diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java index 2804a13..3f6063d 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java @@ -7,6 +7,8 @@ import com.bonus.common.core.annotation.Excels; import com.bonus.common.core.web.domain.BaseEntity; import com.bonus.common.core.xss.Xss; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -187,6 +189,22 @@ public class SysUser extends BaseEntity { @Excel(name = "生效截止日期", width = 30, dateFormat = "yyyy-MM-dd") private Date effectiveEndDay; + @Getter + @ApiModelProperty("查询类型") + private Integer queryTyoe = 1; + + public void setQueryTyoe(Integer queryTyoe) { + this.queryTyoe = queryTyoe; + } + + @Getter + @ApiModelProperty("查询类型") + private boolean bingStatus = false; + + public void setBingStatus(boolean bingStatus) { + this.bingStatus = bingStatus; + } + public SysUser() { } diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java index db74214..1e22edf 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java @@ -19,7 +19,7 @@ import java.util.List; /** * 用户服务降级处理 - * + * * @author bonus */ @Component @@ -38,6 +38,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory()); } + @Override + public TableDataInfo listAll(SysUser user, String source) { + return getDataTableError(new ArrayList()); + } + @Override public R getUserInfo(String username, String source) { diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java index 7c3f909..0709569 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java @@ -95,6 +95,20 @@ public class SysUserController extends BaseController { } return getDataTableError(new ArrayList<>()); } + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list")) + @GetMapping("/list_all") + @SysLog(title = "用户管理", businessType = OperaType.QUERY, logType = 0, module = "系统管理->用户管理", details = "查询用户列表") + public TableDataInfo listAll(SysUser user) { + try { + user .setQueryTyoe(2); + List list = userService.selectUserList(user); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + @RequiresPermissions("system:user:export") @PostMapping("/export") @@ -278,6 +292,7 @@ public class SysUserController extends BaseController { */ //@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:query")) @GetMapping(value = {"/", "/{userId}"}) +// @GetMapping("/{userId:\\d+}") public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) { try { userService.checkUserDataScope(userId); diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java index a3a9827..36acb07 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java @@ -158,4 +158,6 @@ public interface SysUserMapper { Integer approvalStatus(Long userId); int systemUpdateUser(SysUser user); + + List selectBindUserIds(); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java index f7f47a4..71b6961 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java @@ -118,10 +118,19 @@ public class SysUserServiceImpl implements ISysUserService { // user.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); //} List sysUsers = userMapper.selectUserList(user); + for (SysUser sysUser : sysUsers) { sysUser.setPhotoUrl(remoteFileService.getFullFileUrl(sysUser.getPhotoUrl())); } - return sysUsers; + if(user.getQueryTyoe()==1){ + return sysUsers; + }else{ + List userIds = userMapper.selectBindUserIds(); + Set userIdSet = new HashSet<>(userIds); + sysUsers.forEach(s -> s.setBingStatus(userIdSet.contains(s.getUserId()))); + return sysUsers; + } + } public List selectUserList4Job(SysUser user) { diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml index 04a3df6..305d133 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -428,5 +428,8 @@ - +