Merge remote-tracking branch 'origin/master' into prod

authorize-api-service/src/main/java/com/xy/redis/RedisCache.java

@@ -27,7 +27,7 @@ import java.util.List;
 @Component
 public class RedisCache extends AuthorizeUtils {
 
- 
+
     /**
      * 缓存业务系统权限到redis
      *
@@ -63,7 +63,7 @@ public class RedisCache extends AuthorizeUtils {
         //获取登录人所有部门
         JoinLambdaWrapper<SysDept> sysDeptJoinLambdaWrapper = new JoinLambdaWrapper<>(SysDept.class)
                 .eq(SysDept::getStatus, true)
-                .innerJoin(SysUserDept.class, SysUserDept::getDeptId, SysUserDept::getId)
+                .innerJoin(SysUserDept.class, SysUserDept::getDeptId, SysDept::getId)
                 .eq(SysUserDept::getWorkUserId, loginId)
                 .end();
         List<SysDept> sysDepts = sysDeptMapper.joinSelectList(sysDeptJoinLambdaWrapper, SysDept.class);

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

@@ -259,7 +259,7 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
     public R<List<SysWorkVo>> list(ListDto listDto) {
         Long sysId = listDto.getSysId();
         //部门分配为可选，先判断是否存在
-        List<SysUserDept> sysUserDepts = sysUserDeptService.list(Wrappers.<SysUserDept>lambdaQuery().eq(SysUserDept::getSysId, sysId).eq(SysUserDept::getWorkUserId, listDto.getId()));
+        List<SysUserDept> sysUserDepts = sysUserDeptService.list(Wrappers.<SysUserDept>lambdaQuery().eq(SysUserDept::getSysId, sysId).in(SysUserDept::getWorkUserId, listDto.getId()));
 
         //条件构造
         JoinLambdaWrapper<SysWorkUser> joinLambdaWrapper = new JoinLambdaWrapper<>(SysWorkUser.class)