From cf6dff5e42ce6f52db7d591c33b9878d5eee55a0 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Jan 2022 12:34:11 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/app/WxAppinfoController.java | 4 ++-- .../main/java/com/iformall/controller/WxInfoController.java | 3 ++- .../src/main/java/com/iformall/domain/po/WxAppinfo.java | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index 5721e523e..eeb29cf3e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -175,14 +175,14 @@ public class WxAppinfoController extends BaseController { // return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); // } WxAppinfo cAppInfo = wxAppinfoService.getCAppInfoFromRedis(ifParentUpdateAloneTenantInfo().getTenantId(), null); - return new ResultData(cAppInfo); + return new ResultData(new WxAppinfo(cAppInfo.getMouldType())); } @PostMapping("updateAppMouldType") @SystemControllerLog(description = "修改小程序首页风格") public ResultData updateAppMouldType(@RequestBody WxAppinfo appinfo) { logger.debug("[" + getIpAddr() + "] WxAppinfoController::updateAppMouldType"); - if(appinfo == null || appinfo.getId() == null || appinfo.getMouldType() == null){ + if(appinfo.getMouldType() == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } // WxAppinfo updateAppinfo = new WxAppinfo(); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index 27d6e6463..25a16613a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -531,6 +531,7 @@ public class WxInfoController extends BaseController { // return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); // } WxAppinfo cAppInfo = wxAppinfoService.getCAppInfoFromRedis(getTenantInfo().getTenantId(), null); - return new ResultData(cAppInfo); + + return new ResultData(new WxAppinfo(cAppInfo.getMouldType())); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java index 44b5d9a44..8a93f442e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java @@ -46,4 +46,8 @@ public class WxAppinfo extends BaseTenantEntity { private Integer enable; @io.swagger.annotations.ApiModelProperty(value="app平台 EnumAppPlat ",name="plat") private Integer plat; + + public WxAppinfo(Integer mouldType){ + this.mouldType = mouldType; + } }