From 7fbb4c83497675ed6e2742473ec5c86c8dc581c7 Mon Sep 17 00:00:00 2001 From: SjS Date: Wed, 9 Apr 2025 10:03:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=89=8D=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/bst/agreement/domain/AgreementVO.java | 3 +++ .../ruoyi/bst/agreement/mapper/AgreementMapper.xml | 14 +++++++------- .../service/impl/AgreementServiceImpl.java | 6 ++++-- .../service/impl/AgreementValidatorImpl.java | 8 +++++++- .../com/ruoyi/web/bst/AgreementController.java | 1 - 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/domain/AgreementVO.java b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/domain/AgreementVO.java index 2c0ad74..f75ea70 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/domain/AgreementVO.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/domain/AgreementVO.java @@ -13,4 +13,7 @@ public class AgreementVO extends Agreement{ @ApiModelProperty("运营区") private String areaName; + @ApiModelProperty("运营商ID") + private Long agentId; + } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml index 963e43d..3f41060 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml @@ -39,13 +39,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and store_id = #{query.storeId} - and area_id = #{query.areaId} - and title like concat('%', #{query.title}, '%') - and brief like concat('%', #{query.brief}, '%') - and content like concat('%', #{query.content}, '%') - and agreement_type = #{query.agreementType} - and duration = #{query.duration} + and bag.store_id = #{query.storeId} + and bag.area_id = #{query.areaId} + and bag.title like concat('%', #{query.title}, '%') + and bag.brief like concat('%', #{query.brief}, '%') + and bag.content like concat('%', #{query.content}, '%') + and bag.agreement_type = #{query.agreementType} + and bag.duration = #{query.duration} ${@com.ruoyi.framework.util.DataScopeUtil@dataScope( null, "bag.store_id", diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementServiceImpl.java index 52e7cbe..5fb0489 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementServiceImpl.java @@ -28,8 +28,6 @@ public class AgreementServiceImpl implements AgreementService @Autowired private AgreementMapper agreementMapper; @Autowired - private UserService userService; - @Autowired private AreaService areaService; /** @@ -66,6 +64,10 @@ public class AgreementServiceImpl implements AgreementService public int insertAgreement(Agreement agreement) { agreement.setCreateTime(DateUtils.getNowDate()); + AreaVO area = areaService.selectAreaById(agreement.getAreaId()); + if (area !=null){ + agreement.setStoreId(area.getUserId()); + }; distinct(agreement); return agreementMapper.insertAgreement(agreement); } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementValidatorImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementValidatorImpl.java index 0ae0ae3..657194f 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementValidatorImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementValidatorImpl.java @@ -4,6 +4,7 @@ import com.ruoyi.bst.agreement.domain.AgreementQuery; import com.ruoyi.bst.agreement.domain.AgreementVO; import com.ruoyi.bst.agreement.mapper.AgreementMapper; import com.ruoyi.bst.agreement.service.AgreementValidator; +import com.ruoyi.bst.area.domain.AreaVO; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.collection.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -53,7 +54,7 @@ public class AgreementValidatorImpl implements AgreementValidator { if (agreement == null) { return false; } - boolean canOperate = isMch(agreement, userId); + boolean canOperate = isMch(agreement, userId) || isAgent(agreement,userId); if (!canOperate) { return false; } @@ -62,6 +63,11 @@ public class AgreementValidatorImpl implements AgreementValidator { return true; } + + private boolean isAgent(AgreementVO agreement, Long userId) { + return agreement != null && agreement.getAgentId() != null && agreement.getAgentId().equals(userId); + } + private boolean isMch(AgreementVO agreement, Long userId) { return agreement != null && agreement.getStoreId() != null && agreement.getStoreId().equals(userId); } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/AgreementController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/AgreementController.java index 2992737..b73ced3 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/AgreementController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/AgreementController.java @@ -78,7 +78,6 @@ public class AgreementController extends BaseController @PostMapping public AjaxResult add(@RequestBody Agreement agreement) { - agreement.setStoreId(getUserId()); return toAjax(agreementService.insertAgreement(agreement)); }