Преглед на файлове

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

zhaoxian преди 4 години
родител
ревизия
52c6d1f6ba

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/KuaishouAppPackageController.java

@@ -91,7 +91,7 @@ public class KuaishouAppPackageController {
     @PostMapping(value = "/getAppsDetail")
     @PostMapping(value = "/getAppsDetail")
     public Result<Object> getAppsDetail(@RequestBody JSONObject data) {
     public Result<Object> getAppsDetail(@RequestBody JSONObject data) {
         try {
         try {
-            String ids = data.getString("ids");
+            String ids = data.getString("apptemIds");
             if (Check.isNull(ids)) {
             if (Check.isNull(ids)) {
                 return Result.error("缺少参数");
                 return Result.error("缺少参数");
             }
             }

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/KuaishouProjectStrategyController.java

@@ -254,7 +254,7 @@ public class KuaishouProjectStrategyController {
             result.error500("未找到对应实体");
             result.error500("未找到对应实体");
         } else {
         } else {
             Project project = projectService.getById(kuaishouProjectStrategy.getProjectId());
             Project project = projectService.getById(kuaishouProjectStrategy.getProjectId());
-            if (Check.isNull(project)) {
+            if (!Check.isNull(project)) {
                 kuaishouProjectStrategy.setProjectName(project.getProjectName());
                 kuaishouProjectStrategy.setProjectName(project.getProjectName());
             }
             }
             result.setResult(kuaishouProjectStrategy);
             result.setResult(kuaishouProjectStrategy);

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

@@ -135,7 +135,7 @@
 
 
     <select id="getProjectAppList" resultType="cn.com.ctop.kuaishou.modules.ai.entity.KuaishouAppPackage">
     <select id="getProjectAppList" resultType="cn.com.ctop.kuaishou.modules.ai.entity.KuaishouAppPackage">
         SELECT
         SELECT
-                 id,
+               id,
                project_id,
                project_id,
                CONCAT(app_name,'(',CASE  WHEN platform=1 OR platform=2 then 'Android' else 'iOS' END ,')') as 'appName',
                CONCAT(app_name,'(',CASE  WHEN platform=1 OR platform=2 then 'Android' else 'iOS' END ,')') as 'appName',
                platform
                platform

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/mapper/xml/KuaishouAppPackageRelMapper.xml

@@ -101,6 +101,7 @@
 
 
     <select id="getAppsDetail" resultType="com.alibaba.fastjson.JSONObject">
     <select id="getAppsDetail" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         SELECT
+            apptem_id as 'apptemId',
             t2.id,
             t2.id,
             t1.project_id as 'projectId',
             t1.project_id as 'projectId',
             t1.app_name as 'appName',
             t1.app_name as 'appName',