Merge branch 'feature/REQ-3282-zhh' into 'feature/REQ-3282'

Feature/req 3282 zhh

See merge request universal/infrastructure/backend/orgmanax!37

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/qualification/entity/QualificationOuType.java

@@ -8,6 +8,7 @@ import lombok.experimental.Accessors;
 import lombok.experimental.SuperBuilder;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 资质序列/单位类型
@@ -63,4 +64,19 @@ public class QualificationOuType implements Serializable {
      */
     private Integer type;
 
+    /**
+     * 是否删除 0否,其他是
+     */
+    private Long isDelete = 0L;
+
+    /**
+     * 创建时间
+     */
+    private Date createAt;
+
+    /**
+     * 更新时间
+     */
+    private Date updateAt;
+
 }

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/entity/OrganizationalContact.java

@@ -70,5 +70,10 @@ public class OrganizationalContact implements Serializable {
      * 更新时间
      */
     private Date updateAt;
-}
 
+    /**
+     * 是否删除 0否,其他是
+     */
+    private Long isDelete = 0L;
+
+}

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java

@@ -116,6 +116,8 @@ public interface UnitQueryRepository {
         private Set<String> legalPhones;
         @CriteriaField(field = "identityType", operator = Operator.EQ)
         private Integer identityType;
+        @CriteriaField(ignore = true)
+        private Boolean includeDeleted;
     }
 
     @EqualsAndHashCode(callSuper = true)

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/impl/UnitQueryRepositoryImpl.java

@@ -8,6 +8,7 @@ import cn.axzo.orgmanax.infra.dao.unit.entity.OrganizationalUnit;
 import cn.axzo.orgmanax.infra.dao.unit.repository.UnitQueryRepository;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.BooleanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
@@ -27,6 +28,9 @@ public class UnitQueryRepositoryImpl implements UnitQueryRepository {
     public PageResp<UnitResp> page(ListReq req) {
         IPage<OrganizationalUnit> page = PageConverter.toMybatis(req, OrganizationalUnit.class);
         QueryWrapper<OrganizationalUnit> wrapper = QueryWrapperHelper.fromBean(req, OrganizationalUnit.class);
+        if (!BooleanUtil.isTrue(req.getIncludeDeleted())) {
+            wrapper.eq("is_delete", 0);
+        }
         IPage<UnitResp> results = unitDao.page(page, wrapper)
                 .convert(e -> BeanUtil.toBean(e, UnitResp.class));
         PageResp<UnitResp> resp = PageConverter.toResp(results);