From 203d2d4843ff6f3e7a7036cdbb399e81c3122486 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 12 Nov 2019 11:06:14 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=9B=86=E5=9B=A2=E7=89=88][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E9=9B=86=E5=9B=A2=E7=94=A8=E6=88=B7=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mem/WxScoreRulesController.java | 14 ++++++++++++-- .../db/migration/V201911121100__GROUP_MENU.sql | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java index a39c40bad..a02b03b79 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java @@ -5,10 +5,12 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxScoreRules; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumCreditLockedStatus; import com.iformall.service.WxScoreRulesService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -40,7 +42,11 @@ public class WxScoreRulesController extends BaseController { @SystemControllerLog(description = "成长值-积分-配置-新增") public ResultData add(@RequestBody WxScoreRules wxScoreRules) { logger.debug("[" + getIpAddr() + "] WxScoreRulesController::add"); - wxScoreRules.updateTenantInfo(getTenantInfo()); + TenantEntity tenantEntity = getTenantInfo(); + if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { + return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); + } + wxScoreRules.updateTenantInfo(tenantEntity); wxScoreRulesService.saveOrUpdate(wxScoreRules); return new ResultData(); } @@ -65,7 +71,11 @@ public class WxScoreRulesController extends BaseController { if (null == wxScoreRules.getCreditLocked()) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "creditLocked不能为空"); } - wxScoreRules.updateTenantInfo(getTenantInfo()); + TenantEntity tenantEntity = getTenantInfo(); + if (StringUtils.isNotBlank(tenantEntity.getSubTenantId())) { + return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); + } + wxScoreRules.updateTenantInfo(tenantEntity); try { wxScoreRulesService.updateCreditLocked(wxScoreRules); } catch (Exception e) { diff --git a/mallinkAdmin/src/main/resources/db/migration/V201911121100__GROUP_MENU.sql b/mallinkAdmin/src/main/resources/db/migration/V201911121100__GROUP_MENU.sql index ec426ec72..a887081fd 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201911121100__GROUP_MENU.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201911121100__GROUP_MENU.sql @@ -1,3 +1,3 @@ update `mall_sale_type` set `menus` = -'[1, 2, 5, 6, 8, 10, 50, 101, 102, 104, 105, 106, 108, 203, 204, 206, 207, 501, 502, 503, 504, 505, 506, 507, 509, 511, 512, 522, 523, 591, 595, 601, 611, 621, 622, 623, 624, 625, 626, 627, 901, 902]' +'[1, 2, 5, 6, 8, 10, 50, 101, 102, 104, 105, 106, 108, 203, 204, 206, 501, 502, 503, 504, 505, 506, 507, 509, 511, 512, 522, 523, 591, 595, 601, 611, 621, 622, 623, 624, 625, 626, 627, 901, 902]' where id = 100; \ No newline at end of file