fix 角色

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/SysRole.java

@@ -16,6 +16,7 @@ import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -119,6 +120,9 @@ public class SysRole implements Serializable
     @TableField(exist = false)
     private Long[] deptIds;
 
+    @TableField(exist = false)
+    private List<String> statusArray;
+
     public SysRole(Long roleId)
     {
         this.roleId = roleId;

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/SysUser.java

@@ -121,6 +121,9 @@ public class SysUser implements Serializable
     /** 备注 */
     private String remark;
 
+    @TableField(exist = false)
+    private List<String> statusArray;
+
     /**
      * 请求参数
      */

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysRoleServiceImpl.java

@@ -54,6 +54,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         return list(new LambdaQueryWrapper<SysRole>()
                 .like(StrUtil.isNotBlank(role.getRoleName()), SysRole::getRoleName, role.getRoleName())
                 .eq(StrUtil.isNotBlank(role.getStatus()), SysRole::getStatus, role.getStatus())
+                .in(role.getStatusArray()!=null, SysRole::getStatus, role.getStatusArray())
                 .like(StrUtil.isNotBlank(role.getRoleKey()), SysRole::getRoleKey, role.getRoleKey())
                 .apply(Validator.isNotEmpty(params.get("beginTime")),
                         "date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",