Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseDTO.java

@@ -12,7 +12,8 @@ public class WxEnterpriseDTO implements Serializable {
     private String wxEnterpriseId;
 
     private String permanentCode;
-
+    // 业务中请不要使用此属性
+    private String corpid ;
     private String corpName;
 
     private String corpType;
@@ -108,6 +109,14 @@ public class WxEnterpriseDTO implements Serializable {
     private Integer wxSecurityType ;
     private String wxCorpid ;
     private String openCorpid ;
+    
+    public String getCorpid() {
+        return corpid;
+    }
+
+    public void setCorpid(String corpid) {
+        this.corpid = corpid;
+    }
 
     public Integer getWxSecurityType() {
         return wxSecurityType;

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseQwDTO.java

@@ -16,12 +16,21 @@ public class WxEnterpriseQwDTO implements Serializable {
     private String memberSuiteId;
     // 第三方
     private String thirdCorpid;
+    // 明文的corpid
+    private String selfCorpid ;
     
     // 第三方使用的加密的userid
     public boolean needOpenUserId3th() {
         return this.wxSecurityType == 2 || this.wxSecurityType == 3;
     }
+    
+    public String getSelfCorpid() {
+        return selfCorpid;
+    }
 
+    public void setSelfCorpid(String selfCorpid) {
+        this.selfCorpid = selfCorpid;
+    }
     public String getDkSuiteId() {
         return dkSuiteId;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WxEnterpriseServiceImpl.java

@@ -77,6 +77,11 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
                 }
             });
         }
+        if(StringUtils.isBlank(qw.getMemberCorpid())) {
+            logger.info("会员小程序是自建");
+            qw.setMemberCorpid(wxEnterprise.getWxCorpid());
+        }
+        qw.setSelfCorpid(wxEnterprise.getWxCorpid());
         logger.info("企微所有corpid信息={}",JSON.toJSON(qw));
         return qw;
     }

haoban-manage3-service/src/main/resources/mapper/WxEnterpriseMapper.xml

@@ -471,7 +471,7 @@
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_wx_enterprise
-        where  wx_corpid = #{corpId} or open_corpid = #{corpid}
+        where  ( wx_corpid = #{corpId} or open_corpid = #{corpId} )
         <if test="statusFlag != null">
             and status_flag = #{statusFlag}
         </if>