Explorar o código

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

zhaoxian %!s(int64=4) %!d(string=hai) anos
pai
achega
9af76930e1

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java

@@ -149,7 +149,6 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
         temp.put("project", projectMember);
         QueryWrapper<UserAllocation> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("project_id", projectMember.getProjectId());
-        queryWrapper.eq("account_status", 0);
         queryWrapper.isNotNull("account_id");
         List<UserAllocation> userAllocations = userAllocationMapper.selectList(queryWrapper);
         if (userAllocations.isEmpty()) {

+ 2 - 2
jeecg-boot-module-system/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 spring:
   profiles:
-    active: wps
-#    active: @activatedProperties@
+#    active: wps
+    active: @activatedProperties@
 
 swagger:
   production: false

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KsVideoReportMapper.xml

@@ -32,7 +32,7 @@
         GROUP BY t1.signature
         ) t
         WHERE t.clip like '%${clip}%'
-        AND t.shot like '%${shot}%'
+        AND (t.shot LIKE '%%' or t.shot is null)
         AND t.plan like '%${plan}%'
         ORDER BY ${target} ${order}
     </select>

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/BytedanceVideoReportMapper.xml

@@ -32,7 +32,7 @@
         GROUP BY t1.signature
         ) t
         WHERE t.clip like '%${clip}%'
-        AND t.shot like '%${shot}%'
+        AND (t.shot LIKE '%%' or t.shot is null)
         AND t.plan like '%${plan}%'
         ORDER BY ${target} ${order}
     </select>