Merge branch 'master' into developer

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

@@ -70,8 +70,13 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         Integer isCustomizedApp = dto.getIsCustomizedApp();
         WxEnterpriseDTO wxDTO = EntityUtil.changeEntityByJSON(WxEnterpriseDTO.class, dto);
         String wxEnterpriseId = "";
+        TabHaobanWxEnterprise wxEnterprise = null;
         //获取授权好办小程序
-        TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseService.getEnterpriseByCorpName(corpName);
+        wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpid);
+        if (wxEnterprise == null) {
+            wxEnterprise = this.wxEnterpriseService.getEnterpriseByCorpName(corpName);
+        }
+
         if (wxEnterprise != null) {
             wxEnterpriseId = wxEnterprise.getWxEnterpriseId();
             WxEnterpriseDTO wxEnterpriseDTO = new WxEnterpriseDTO();

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

@@ -456,14 +456,14 @@
         <if test="statusFlag != null">
             and status_flag = #{statusFlag}
         </if>
-        limit 1
+        order by create_time desc limit 1
     </select>
 
     <select id="getEnterpriseByCorpName" resultMap="BaseResultMap" parameterType="java.lang.String">
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_wx_enterprise
-        where (corp_name = #{corpName} or corpid= #{corpName})
+        where corp_name = #{corpName} and status_flag = 1
         order by create_time desc limit 1
     </select>