谭斌 2 年之前
父節點
當前提交
7c02f1637a

+ 3 - 2
authorize-api-service/src/main/java/com/xy/service/impl/SysWorkUserServiceImpl.java

@@ -219,13 +219,14 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
     @Override
     @ApiOperation("集合查询")
     public R<List<SysWorkVo>> list(ListDto listDto) {
+        Long sysId = listDto.getSysId();
         //条件构造
         JoinLambdaWrapper<SysWorkUser> joinLambdaWrapper = new JoinLambdaWrapper<>(SysWorkUser.class)
                 .in(SysWorkUser::getId, listDto.getId())
-                .leftJoin(SysUserRole.class, SysUserRole::getWorkUserId, SysWorkUser::getId)
+                .leftJoin(SysUserRole.class, SysUserRole::getWorkUserId, SysWorkUser::getId).eq(sysId != null, SysUserRole::getSysId, sysId)
                 .manyToManySelect(SysWorkVo::getRoleIds, Long.class, cb -> cb.add(SysUserRole::getRoleId))
                 .end()
-                .leftJoin(SysUserDept.class, SysUserDept::getWorkUserId, SysWorkUser::getId)
+                .leftJoin(SysUserDept.class, SysUserDept::getWorkUserId, SysWorkUser::getId).eq(sysId != null, SysUserDept::getSysId, sysId)
                 .manyToManySelect(SysWorkVo::getDeptIds, Long.class, cb -> cb.add(SysUserDept::getDeptId))
                 .end();
         //查询数据

+ 3 - 0
authorize-api/src/main/java/com/xy/dto/SysWorkUser/ListDto.java

@@ -17,4 +17,7 @@ public class ListDto {
     @ApiModelProperty(value = "用户ID")
     private List<Long> id;
 
+    @ApiModelProperty(value = "用户ID", required = false)
+    private Long sysId;
+
 }