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

Feature/req 3282 zhh

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

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/ListUnitReq.java

@@ -50,6 +50,8 @@ public class ListUnitReq extends PageReqV2 {
     private Set<Long> identityIds;
     @CriteriaField(field = "legalIdCard", operator = Operator.IN)
     private Set<String> legalIdCards;
+    @CriteriaField(field = "legalPhone", operator = Operator.IN)
+    private Set<String> legalPhones;
     @CriteriaField(field = "identityType", operator = Operator.EQ)
     private Integer identityType;
     /**

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/UpdateUnitReq.java

@@ -192,5 +192,9 @@ public class UpdateUnitReq implements Serializable {
      * 市名称
      */
     private String cityName;
+    /**
+     * 历史平台班组的同步数据，0：还未同步，1：同步完成
+     */
+    private Integer syncState;
 
 }

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

@@ -1,5 +1,6 @@
 package cn.axzo.orgmanax.infra.dao.unit.entity;
 
+import cn.axzo.trade.datasecurity.core.annotation.CryptField;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -99,6 +100,7 @@ public class OrganizationalUnit implements Serializable {
     /**
      * 法人代表身份证
      */
+    @CryptField
     private String legalIdCard;
 
     /**

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

@@ -108,6 +108,8 @@ public interface UnitQueryRepository {
         private Set<Long> identityIds;
         @CriteriaField(field = "legalIdCard", operator = Operator.IN)
         private Set<String> legalIdCards;
+        @CriteriaField(field = "legalPhone", operator = Operator.IN)
+        private Set<String> legalPhones;
         @CriteriaField(field = "identityType", operator = Operator.EQ)
         private Integer identityType;
     }

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/dto/UpdateUnitReq.java

@@ -190,5 +190,8 @@ public class UpdateUnitReq {
      * 市名称
      */
     private String cityName;
-
+    /**
+     * 历史平台班组的同步数据，0：还未同步，1：同步完成
+     */
+    private Integer syncState;
 }