Преглед изворни кода

Merge branch 'V2.0.1' into test

zhaoxian пре 3 година
родитељ
комит
d42e9ba87a

+ 1 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/channel/entity/KuaishouChannelCreateStrategy.java

@@ -189,6 +189,7 @@ public class KuaishouChannelCreateStrategy {
     /**
      * 创建类型,1新增,2,选择
      */
+    @TableField(exist = false)
     private String appCreateType;
 
     /**

+ 3 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/channel/mapper/xml/KuaishouChannelMapper.xml

@@ -195,7 +195,6 @@
         t1.actionbar_click_url,
         t1.schema_uri
         FROM `ctop_kuaishou_channel` t1
-        LEFT JOIN ctop_kuaishou_channel_app_info t2 ON t1.app_id = t2.app_id
         WHERE t1.strategy_id IN
         <foreach collection="strategys" item="item" separator=","
                  open="(" close=")">
@@ -203,7 +202,9 @@
         </foreach>
         AND t1.state = 1
         AND t1.channel_state = 1
-        AND t2.app_name = #{appName}
+        AND app_id in (
+            SELECT app_id FROM ctop_kuaishou_channel_app_info where app_name = #{appName}
+        )
         AND t1.usage_times = #{usageTimes}
         and t1.usage_level = #{usageLevel}
         GROUP BY  t1.channel_code