he2802 %!s(int64=4) %!d(string=hai) anos
pai
achega
a0ca6b0f55

+ 3 - 0
zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/SysDept.java

@@ -100,4 +100,7 @@ public class SysDept implements Serializable
     @TableField(exist = false)
     private Map<String, Object> params = new HashMap<>();
 
+    @TableField(exist = false)
+    private List<String> statusArray;
+
 }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysPost.java

@@ -13,6 +13,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;
 
 /**
@@ -106,4 +107,7 @@ public class SysPost implements Serializable {
     @TableField(exist = false)
     private boolean flag = false;
 
+    @TableField(exist = false)
+    private List<String> statusArray;
+
 }

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysDeptServiceImpl.java

@@ -54,6 +54,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
                         SysDept::getParentId, dept.getParentId())
                 .like(StrUtil.isNotBlank(dept.getDeptName()), SysDept::getDeptName, dept.getDeptName())
                 .eq(StrUtil.isNotBlank(dept.getStatus()), SysDept::getStatus, dept.getStatus())
+                .in(dept.getStatusArray()!=null, SysDept::getStatus, dept.getStatusArray())
                 .apply(dataScope != null, dataScope != null ? dataScope.toString() : null)
                 .orderByAsc(SysDept::getParentId)
                 .orderByAsc(SysDept::getOrderNum));

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysPostServiceImpl.java

@@ -5,6 +5,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.constant.UserConstants;
+import com.zhongzheng.common.core.domain.entity.SysDept;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.modules.system.domain.SysPost;
 import com.zhongzheng.modules.system.domain.SysUserPost;
@@ -39,6 +40,7 @@ public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPost> impl
         return list(new LambdaQueryWrapper<SysPost>()
                 .like(StrUtil.isNotBlank(post.getPostCode()), SysPost::getPostCode, post.getPostCode())
                 .eq(StrUtil.isNotBlank(post.getStatus()), SysPost::getStatus, post.getStatus())
+                .in(post.getStatusArray()!=null, SysPost::getStatus, post.getStatusArray())
                 .like(StrUtil.isNotBlank(post.getPostName()), SysPost::getPostName, post.getPostName()));
     }