1.功能修改-将人员表做了资源库特殊人员的分割，为保持原有功能保持原有业务逻辑，查回原本的数据，进行修改

2.修复报错-角色编辑

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleEditParam.java

@@ -12,6 +12,7 @@
  */
 package vip.xiaonuo.sys.modular.role.param;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -27,6 +28,7 @@ import javax.validation.constraints.NotNull;
  **/
 @Getter
 @Setter
+@JsonIgnoreProperties(ignoreUnknown = true) // 忽略未知字段
 public class SysRoleEditParam {
 
     /** id */

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleSelectorUserParam.java

@@ -41,4 +41,8 @@ public class SysRoleSelectorUserParam {
     /** 姓名关键词 */
     @ApiModelProperty(value = "姓名关键词")
     private String searchKey;
+
+    /** 是否是资源库特殊账号，0否1是 */
+    @ApiModelProperty(value = "是否是资源库特殊账号，0否1是")
+    private String isResourceaccount;
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java

@@ -458,6 +458,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         // 只查询部分字段
         lambdaQueryWrapper.select(SysUser::getId, SysUser::getAvatar, SysUser::getOrgId, SysUser::getPositionId, SysUser::getAccount,
                 SysUser::getName, SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate);
+        //查人员时不查出资源库的特殊表时“人员”，如公共资源和群组
+        sysRoleSelectorUserParam.setIsResourceaccount("0");
+        lambdaQueryWrapper.eq(SysUser::getIsResourceaccount, sysRoleSelectorUserParam.getIsResourceaccount());
         // 如果查询条件为空，则直接查询
         if(ObjectUtil.isAllEmpty(sysRoleSelectorUserParam.getOrgId(), sysRoleSelectorUserParam.getSearchKey())) {
             return sysUserService.getAllUserSelectorList();

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/entity/SysUser.java

@@ -286,4 +286,8 @@ public class SysUser extends CommonEntity {
     @TableField(exist = false)
     private String directorName;
 
+    /** 是否是资源库特殊账号，0否1是 */
+    @ApiModelProperty(value = "是否是资源库特殊账号，0否1是")
+    private String isResourceaccount;
+
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserExportParam.java

@@ -37,4 +37,8 @@ public class SysUserExportParam {
     /** 用户id集合 */
     @ApiModelProperty(value = "用户id集合")
     private String userIds;
+
+    /** 是否是资源库特殊账号，0否1是 */
+    @ApiModelProperty(value = "是否是资源库特殊账号，0否1是")
+    private String isResourceaccount;
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserPageParam.java

@@ -53,4 +53,8 @@ public class SysUserPageParam {
     /** 所属组织 */
     @ApiModelProperty(value = "所属组织")
     private String orgId;
+
+    /** 是否是资源库特殊账号，0否1是 */
+    @ApiModelProperty(value = "是否是资源库特殊账号，0否1是")
+    private String isResourceaccount;
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java

@@ -226,6 +226,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (ObjectUtil.isNotEmpty(sysUserPageParam.getUserStatus())) {
             queryWrapper.lambda().eq(SysUser::getUserStatus, sysUserPageParam.getUserStatus());
         }
+        //查人员时不查出资源库的特殊表时“人员”，如公共资源和群组
+        sysUserPageParam.setIsResourceaccount("0");
+        queryWrapper.lambda().eq(SysUser::getIsResourceaccount, sysUserPageParam.getIsResourceaccount());
         if (ObjectUtil.isAllNotEmpty(sysUserPageParam.getSortField(), sysUserPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(sysUserPageParam.getSortOrder());
             queryWrapper.orderBy(true, sysUserPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
@@ -1180,6 +1183,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 }
             }
             String fileName = "SNOWY2.0系统B端用户信息清单.xlsx";
+            //查人员时不查出资源库的特殊表时“人员”，如公共资源和群组
+            sysUserExportParam.setIsResourceaccount("0");
+            queryWrapper.lambda().eq(SysUser::getIsResourceaccount, sysUserExportParam.getIsResourceaccount());
             List<SysUser> sysUserList = this.list(queryWrapper);
             if(ObjectUtil.isEmpty(sysUserList)) {
                 throw new CommonException("无数据可导出");
@@ -1418,9 +1424,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     public Page<SysUser> getAllUserSelectorList() {
-        return this.page(CommonPageRequest.defaultPage(), new LambdaQueryWrapper<SysUser>().select(SysUser::getId,
+        LambdaQueryWrapper<SysUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.select(SysUser::getId,
                 SysUser::getAvatar, SysUser::getOrgId, SysUser::getPositionId, SysUser::getAccount, SysUser::getName,
-                SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate).orderByAsc(SysUser::getSortCode));
+                SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate).orderByAsc(SysUser::getSortCode);
+        //查人员时不查出资源库的特殊表时“人员”，如公共资源和群组
+        lambdaQueryWrapper.eq(SysUser::getIsResourceaccount, "0");
+        return this.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
     }
 
     /* ====用户部分所需要用到的选择器==== */