feat:[REQ-3282]实现协同关系方查询接口

orgmanax-api/src/main/java/cn/axzo/orgmanax/api/cooperateship/req/ListOrgCooperateShipReq.java

@@ -32,41 +32,41 @@ public class ListOrgCooperateShipReq {
     /**
      * 工作台类型
      */
-//    @CriteriaField(field = "workspaceType", operator = Operator.IN)
+    @CriteriaField(field = "workspaceType", operator = Operator.IN)
     @Builder.Default
     private Set<Integer> workspaceType = Collections.emptySet();
 
     /**
      * 单位id集合(如果是班组则插入队伍id)
      */
-//    @CriteriaField(field = "organizationalUnitId", operator = Operator.IN)
+    @CriteriaField(field = "organizationalUnitId", operator = Operator.IN)
     @Builder.Default
     private Set<Long> ouIds = Collections.emptySet();
 
     /**
      * 指定的协同关系类型
      */
-//    @CriteriaField(field = "cooperateType", operator = Operator.IN)
+    @CriteriaField(field = "cooperateType", operator = Operator.IN)
     @Builder.Default
     private Set<Integer> includeCooperateTypes = Collections.emptySet();
     /**
      * 待排除的协同关系类型
      */
-//    @CriteriaField(field = "cooperateType", operator = Operator.NOT_IN)
+    @CriteriaField(field = "cooperateType", operator = Operator.NOT_IN)
     @Builder.Default
     private Set<Integer> excludeCooperateTypes = Collections.emptySet();
 
     /**
      * 节点id
      */
-//    @CriteriaField(field = "organizationalNodeId", operator = Operator.IN)
+    @CriteriaField(field = "organizationalNodeId", operator = Operator.IN)
     @Builder.Default
     private Set<Long> organizationNodeIds = Collections.emptySet();
 
     /**
      * 合作关系 1.合作 2.直属
      */
-//    @CriteriaField(field = "partnerShip", operator = Operator.IN)
+    @CriteriaField(field = "partnerShip", operator = Operator.IN)
     @Builder.Default
     private Set<Integer> partnerShips = Collections.emptySet();
 
@@ -74,7 +74,7 @@ public class ListOrgCooperateShipReq {
     /**
      * 在场状态集合
      */
-//    @CriteriaField(field = "status", operator = Operator.IN)
+    @CriteriaField(field = "status", operator = Operator.IN)
     @Builder.Default
     private Set<Integer> statuses = Collections.emptySet();
 
@@ -82,17 +82,20 @@ public class ListOrgCooperateShipReq {
      * 需要过滤的personId
      * personId
      */
-    private Long filterPersonId;
+    @CriteriaField(ignore = true)
+    private Long filterPersonId ;
 
     /**
      * 当personId有值时，为必填项
      *  1只过滤当前节点数据 2过滤当前节点及以下数据
      */
+    @CriteriaField(ignore = true)
     private Integer filterPersonType;
 
     /**
      * 是否过滤工人
      */
+    @CriteriaField(ignore = true)
     @Builder.Default
     private Boolean isFilterWorker = false;
 
@@ -100,18 +103,21 @@ public class ListOrgCooperateShipReq {
     /**
      * 人员过滤是否包含已退场
      */
+    @CriteriaField(ignore = true)
     @Builder.Default
     private Boolean includeExitPerson = false;
 
     /**
      * 是否查询祖先节点
      */
+    @CriteriaField(ignore = true)
     @Builder.Default
     private Boolean isSelectAncestors = false;
 
     /**
      * 是否查询子孙节点
      */
+    @CriteriaField(ignore = true)
     @Builder.Default
     private Boolean isSelectDescendant = false;
 
@@ -119,6 +125,7 @@ public class ListOrgCooperateShipReq {
      * 条件：当需要查询上下级数据时启用
      * 是否只查一级
      */
+    @CriteriaField(ignore = true)
     @Builder.Default
     private Boolean isSelectLevelOne = false;
 

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/config/MybatisPlusConfig.java

@@ -38,7 +38,7 @@ public class MybatisPlusConfig {
      * 本地启动默认打印sql日志
      */
     @Bean
-    @LocalCondition.Conditional
+//    @LocalCondition.Conditional
     public ConfigurationCustomizer localConfigurationCustomizer() {
         return configuration -> configuration.setLogImpl(StdOutImpl.class);
     }