协议前后端完善

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;
+
 }

ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml

@@ -39,13 +39,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <sql id="searchCondition">
-        <if test="query.storeId != null "> and store_id = #{query.storeId}</if>
+        <if test="query.storeId != null "> and bag.store_id = #{query.storeId}</if>
-        <if test="query.areaId != null "> and area_id = #{query.areaId}</if>
+        <if test="query.areaId != null "> and bag.area_id = #{query.areaId}</if>
-        <if test="query.title != null  and query.title != ''"> and title like concat('%', #{query.title}, '%')</if>
+        <if test="query.title != null  and query.title != ''"> and bag.title like concat('%', #{query.title}, '%')</if>
-        <if test="query.brief != null  and query.brief != ''"> and brief like concat('%', #{query.brief}, '%')</if>
+        <if test="query.brief != null  and query.brief != ''"> and bag.brief like concat('%', #{query.brief}, '%')</if>
-        <if test="query.content != null  and query.content != ''"> and content like concat('%', #{query.content}, '%')</if>
+        <if test="query.content != null  and query.content != ''"> and bag.content like concat('%', #{query.content}, '%')</if>
-        <if test="query.agreementType != null  and query.agreementType != ''"> and agreement_type = #{query.agreementType}</if>
+        <if test="query.agreementType != null  and query.agreementType != ''"> and bag.agreement_type = #{query.agreementType}</if>
-        <if test="query.duration != null "> and duration = #{query.duration}</if>
+        <if test="query.duration != null "> and bag.duration = #{query.duration}</if>
         ${@com.ruoyi.framework.util.DataScopeUtil@dataScope(
          null,
          "bag.store_id",

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);
     }

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);
     }

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));
     }