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 88ceca1..a3c2dd4 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,7 +13,10 @@ public class AgreementVO extends Agreement{
@ApiModelProperty("运营区")
private String areaName;
- @ApiModelProperty("运营商ID")
+ @ApiModelProperty("代理商ID")
private Long agentId;
+
+ @ApiModelProperty("运营商ID")
+ private Long storeId;
}
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 914ed32..3cdbb49 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
@@ -9,7 +9,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
bag.id,
- bag.store_id,
bag.area_id,
bag.title,
bag.brief,
@@ -20,18 +19,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bag.create_time,
bag.update_time,
su.nick_name as user_name,
- ba.name as area_name
+ ba.name as area_name,
+ ba.user_id as store_id,
+ su.agent_id as agent_id
from
bst_agreement bag
- left join sys_user su on bag.store_id = su.user_id
left join bst_area ba on bag.area_id = ba.id
+ left join sys_user su on ba.user_id = su.user_id
- 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}, '%')
@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
${@com.ruoyi.framework.util.DataScopeUtil@dataScope(
null,
- "bag.store_id",
+ "ba.user_id,su.agent_id",
null,
null,
query.scope
@@ -80,7 +80,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into bst_agreement
- store_id,
area_id,
title,
brief,
@@ -92,7 +91,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_time,
- #{storeId},
#{areaId},
#{title},
#{brief},
@@ -108,7 +106,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into bst_agreement
- store_id,
area_id,
title,
brief,
@@ -121,8 +118,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
values
- #{i.storeId},
- default,
#{i.areaId},
default,
#{i.title},
@@ -146,16 +141,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update bst_agreement
-
-
-
- WHEN #{item.id} THEN #{item.storeId}
-
-
- WHEN #{item.id} THEN `store_id`
-
-
-
@@ -252,7 +237,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- store_id = #{data.storeId},
area_id = #{data.areaId},
title = #{data.title},
brief = #{data.brief},
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 657194f..2a2c0b9 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
@@ -5,6 +5,7 @@ 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.bst.area.service.AreaService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.collection.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +19,8 @@ public class AgreementValidatorImpl implements AgreementValidator {
@Autowired
private AgreementMapper agreementMapper;
+ @Autowired
+ private AreaService areaService;
@Override
public boolean canEdit(Long agreementId) {