Bläddra i källkod

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-boot

syh 5 år sedan
förälder
incheckning
170ebf9855

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ProjectMemberMapper.xml

@@ -107,7 +107,7 @@
 
     <select id="queryProjectMemberByUserId" resultType="org.jeecg.modules.ctop.entity.ProjectMember">
         select
-        distinct b.id as projectId,
+        distinct b.project_id as projectId,
         b.project_name as projectName,
         a.advertiser_id as advertiserId,
         a.advertiser_name as advertiserName,

+ 2 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/FileInfoServiceImpl.java

@@ -78,6 +78,8 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
                     sendMessageService.sendFeishuMessage(userId,feishuMessage);
                 }
 
+            }else{
+                log.info("头条上传素材f返回结果为空,返回信息:{},accountId:{}", jsonObject, accountId);
             }
 
 

+ 1 - 1
module-ctop/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadServiceImpl.java

@@ -175,7 +175,7 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
                     Long accountId = accountArray.getLong(i);
                     QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
                     tokenQueryWrapper.eq("account_id", accountId);
-                    tokenQueryWrapper.eq("media_id", mediaId);
+                   // tokenQueryWrapper.eq("media_id", mediaId);
                     tokenQueryWrapper.orderByDesc("create_time");
                     tokenQueryWrapper.last("limit 1");
                     CtopOauthToken ctopOauthToken = oauthTokenMapper.selectOne(tokenQueryWrapper);