fix 字典 status

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/SysDictData.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;
 
 /**
@@ -103,6 +104,9 @@ public class SysDictData implements Serializable
     @Excel(name = "字典类型ID", cellType = ColumnType.NUMERIC)
     @NotNull(message = "字典类型ID不能为空")
     private Long dictTypeId;
+
+    @TableField(exist = false)
+    private List<String> statusArray;
     /**
      * 请求参数
      */

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

@@ -14,6 +14,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;
 
 /**
@@ -73,6 +74,8 @@ public class SysDictType implements Serializable
     /** 备注 */
     private String remark;
 
+    @TableField(exist = false)
+    private List<String> statusArray;
     /**
      * 请求参数
      */

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

@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.common.core.domain.entity.SysDictData;
+import com.zhongzheng.common.core.domain.entity.SysDictType;
 import com.zhongzheng.common.utils.DictUtils;
 import com.zhongzheng.modules.system.mapper.SysDictDataMapper;
 import com.zhongzheng.modules.system.service.ISysDictDataService;
@@ -31,6 +32,7 @@ public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDi
         return list(new LambdaQueryWrapper<SysDictData>().eq(StrUtil.isNotBlank(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType())
                 .like(StrUtil.isNotBlank(dictData.getDictLabel()), SysDictData::getDictLabel, dictData.getDictLabel())
                 .eq(StrUtil.isNotBlank(dictData.getStatus()), SysDictData::getStatus, dictData.getStatus())
+                .in(dictData.getStatusArray()!=null, SysDictData::getStatus, dictData.getStatusArray())
                 .eq(dictData.getDictTypeId()!=null, SysDictData::getDictTypeId, dictData.getDictTypeId())
                 .orderByAsc(SysDictData::getDictSort));
     }

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

@@ -62,6 +62,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
         return list(new LambdaQueryWrapper<SysDictType>()
                 .like(StrUtil.isNotBlank(dictType.getDictName()),SysDictType::getDictName, dictType.getDictName())
                 .eq(StrUtil.isNotBlank(dictType.getStatus()),SysDictType::getStatus, dictType.getStatus())
+                .in(dictType.getStatusArray()!=null,SysDictType::getStatus, dictType.getStatusArray())
                 .like(StrUtil.isNotBlank(dictType.getDictType()),SysDictType::getDictType, dictType.getDictType())
                 .apply(Validator.isNotEmpty(params.get("beginTime")),
                         "date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",