Ver Fonte

Merge branch 'V2.0.1' into test

zhaoxian há 3 anos atrás
pai
commit
5f0c08f1af

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

@@ -9,37 +9,36 @@
         IFNULL(t1.project_name, '')as 'projectName',
         IFNULL(t1.account_id, '')as 'accountId',
         IFNULL(t1.project_id, '')as 'projectId',
-        IFNULL(t2.realname, '')as 'realname',
         MAX(t1.state_date) as 'stateDate',
         IFNULL(t1.create_type, '') as 'createType',
         IFNULL(t1.state,0) as 'state',
         usage_level as 'usageLevel',
-        (select auth_name from ctop_user_allocation where account_id = t1.account_id) as 'authName',
+        t2.auth_name as 'authName',
         t1.create_time
         FROM ctop_kuaishou_channel t1
-        LEFT JOIN sys_user t2 ON t1.user_id = t2.id
+        LEFT JOIN ctop_user_allocation t2 ON t1.account_id = t2.account_id
         <where>
             <if test="rids != null">
-                and t1.user_id  IN
+                AND t2.user_id IN
                 <foreach collection="rids" item="id" separator=","
                          open="(" close=")">
                     #{id}
                 </foreach>
             </if>
             <if test="projectId != null">
-                and project_id = #{projectId}
+                and t1.project_id = #{projectId}
             </if>
             <if test="productId != null">
-                and product_id = #{productId}
+                and t1.product_id = #{productId}
             </if>
             <if test="accountId != null">
-                and account_id= #{accountId}
+                and t1.account_id= #{accountId}
             </if>
             <if test="state != null">
-                and state= #{state}
+                and t1.state= #{state}
             </if>
         </where>
-        GROUP BY account_id
+        GROUP BY t1.account_id
         ORDER BY create_time DESC
     </select>
 

+ 4 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/channel/service/impl/KuaishouChannelServiceImpl.java

@@ -1109,7 +1109,8 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
                     kuaishouChannel.setSchemaUri(schemaUri.replace(CHANNEL_STR, kuaishouChannel.getChannelCode()));
                     list.add(kuaishouChannel);
                 }
-            } else if (!Check.isNull(clickTrackUrl) && clickTrackUrl.contains(CHANNEL_STR)) {
+            }
+            if (!Check.isNull(clickTrackUrl) && clickTrackUrl.contains(CHANNEL_STR)) {
                 boolean flag = list.size() > 0;
                 for (int i = 0; i < oldList.size(); i++) {
                     String channelCode = oldList.get(i).getChannelCode();
@@ -1121,7 +1122,8 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
                         list.add(kuaishouChannel);
                     }
                 }
-            } else if (!Check.isNull(actionbarClickUrl) && actionbarClickUrl.contains(CHANNEL_STR)) {
+            }
+            if (!Check.isNull(actionbarClickUrl) && actionbarClickUrl.contains(CHANNEL_STR)) {
                 boolean flag = list.size() > 0;
                 for (int i = 0; i < oldList.size(); i++) {
                     String channelCode = oldList.get(i).getChannelCode();