Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/config/Config.java

@@ -12,8 +12,6 @@ import org.springframework.context.annotation.Configuration;
 public class Config {
     @Value("${corpid}")
     private String corpid;
-    @Value("${suiteid}")
-    private String suiteId;
     @Value("${host}")
     private String host;
     @Value("${wxSuiteid}")
@@ -24,12 +22,10 @@ public class Config {
     private String memberOpenPage;
     @Value("${historyMbrMassOperWhiteList}")
     private String historyMbrMassOperWhiteList;
-    @Value("${qywx_member_suite}")
-    private String qywxMemberSuite;
-    @Value("${staff_third_wx_enterpriseId}")
-    private String staffThirdWxEnterpriseId;
     @Value("${hm_link_url}")
     private String hmLinkUrl;
+    @Value("${qywx_hbzs_suite}")
+    private String qywxHbzsSuite;
 
     public String getHmLinkUrl() {
         return hmLinkUrl;
@@ -63,14 +59,6 @@ public class Config {
         this.corpid = corpid;
     }
 
-    public String getSuiteId() {
-        return suiteId;
-    }
-
-    public void setSuiteId(String suiteId) {
-        this.suiteId = suiteId;
-    }
-
     public String getHost() {
         return host;
     }
@@ -95,19 +83,11 @@ public class Config {
         this.historyMbrMassOperWhiteList = historyMbrMassOperWhiteList;
     }
 
-    public String getQywxMemberSuite() {
-        return qywxMemberSuite;
-    }
-
-    public void setQywxMemberSuite(String qywxMemberSuite) {
-        this.qywxMemberSuite = qywxMemberSuite;
-    }
-
-    public String getStaffThirdWxEnterpriseId() {
-        return staffThirdWxEnterpriseId;
+    public String getQywxHbzsSuite() {
+        return qywxHbzsSuite;
     }
 
-    public void setStaffThirdWxEnterpriseId(String staffThirdWxEnterpriseId) {
-        this.staffThirdWxEnterpriseId = staffThirdWxEnterpriseId;
+    public void setQywxHbzsSuite(String qywxHbzsSuite) {
+        this.qywxHbzsSuite = qywxHbzsSuite;
     }
 }

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

@@ -444,7 +444,7 @@
         from tab_haoban_external_clerk_related
         where staff_id = #{staffId,jdbcType=VARCHAR}
         and wx_enterprise_id = #{wxEnterpriseId}
-        <!-- and enterprise_id = #{enterpriseId} -->
+        and enterprise_id = #{enterpriseId} 
         and external_user_id = #{externalUserId}
         and status_flag in(1,3,4)
         order by update_time desc limit 1