Merge branch 'release/2.4.1' into lvzr

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/service/impl/ManageInfoService.java

@@ -147,10 +147,11 @@ public class ManageInfoService implements IManageInfoService {
             manageInfos.add(manageInfo);
         }
         manageInfoRepository.saveAll(manageInfos);
-        Map<String, String> authMap = new HashMap<>();
         //未启用auth管理本系统菜单
         List<TempMtAuth> list = tempMtAuthService.findByUserIds(uids);
         tempMtAuthService.deleteAll(list);
+        Map<String, String> authMap = list.stream()
+                .collect(Collectors.toMap(TempMtAuth::getUserId, TempMtAuth::getOrgId));
         this.setMgeAuth(manageInfos, authMap);
         return ResponseStatus.success();
     }

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/service/impl/AuthUserInfoService.java

@@ -194,7 +194,7 @@ public class AuthUserInfoService implements IAuthUserInfoService {
     }
 
     private List<AuthUserInfo> getPageContent(int pageSize, int pageNumber, List<AuthUserInfo> list) {
-        return list.stream().skip(pageSize * pageNumber).limit(pageNumber).collect(Collectors.toList());
+        return list.stream().skip(pageNumber * pageSize).limit(pageSize).collect(Collectors.toList());
     }
 
     private List<AuthUserInfo> getBusCodeFilterUsers(Searchable searchable, String roleBusiness) {