Merge remote-tracking branch 'origin/test' into test

src/main/java/com/sqx/modules/common/controller/app/AppCommonController.java

@@ -1,6 +1,7 @@
 package com.sqx.modules.common.controller.app;
 
 import com.sqx.common.utils.Result;
+import com.sqx.modules.common.entity.CommonInfo;
 import com.sqx.modules.common.service.CommonInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,7 +19,7 @@ public class AppCommonController {
     @ApiOperation("管理平台通用配置详情")
     @ResponseBody
     public Result getCommon(@PathVariable Integer id) {
-        return Result.success().put("data",commonService.findOne(id));
+        return Result.success().put("data", commonService.findOne(id));
     }
 
 
@@ -47,7 +48,11 @@ public class AppCommonController {
             "                    22拼多多优惠券地址")
     @ResponseBody
     public Result getCommonList(@PathVariable Integer type) {
-        return commonService.findByType(type);
+        CommonInfo data = commonService.findOne(type);
+        if (data != null && data.getIsAppUse() == 0) {
+            return Result.success();
+        }
+        return Result.success().put("data", data);
     }
 
 
@@ -62,7 +67,7 @@ public class AppCommonController {
     @ApiOperation("获取APP使用的KV数据")
     @ResponseBody
     public Result getAppUseKv() {
-        return Result.success().put("data",commonService.findAppKv());
+        return Result.success().put("data", commonService.findAppKv());
     }
 
     @PostMapping("cleanAppUseKv")