dividendProportion默认为0不保存

electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java

@@ -154,6 +154,15 @@ public class AppController extends BaseController
         return success(asArticleService.selectAsArticleByArticleId(articleId));
     }
 
+    /**
+     * 租车协议详情
+     */
+    @GetMapping(value = "/article/agreement")
+    public AjaxResult getAgreementArticleInfo(Long areaId)
+    {
+        return success(asArticleService.getAgreementArticleInfo(areaId));
+    }
+
 
     /**
      * 查询运营区列表

electripper-system/src/main/java/com/ruoyi/system/mapper/AsArticleMapper.java

@@ -68,4 +68,8 @@ public interface AsArticleMapper
      */
     public int deleteAsArticleByArticleIds(Long[] articleIds);
 
+    /**
+     * 租车协议详情
+     */
+    EtArticle getAgreementArticleInfo(Long areaId);
 }

electripper-system/src/main/java/com/ruoyi/system/service/IAsArticleService.java

@@ -86,6 +86,14 @@ public interface IAsArticleService
      */
     public String[] getTagList(Long articleId);
 
+    /**
+     * 获取协议文章内容
+     *
+     * @param areaId
+     * @return
+     */
+    EtArticle getAgreementArticleInfo(Long areaId);
+
 //    /**
 //     * 获取动态分类列表
 //     *

electripper-system/src/main/java/com/ruoyi/system/service/impl/AsArticleServiceImpl.java

@@ -205,6 +205,15 @@ public class AsArticleServiceImpl implements IAsArticleService
         return split;
     }
 
+    /**
+     * 租车协议详情
+     */
+    @Override
+    public EtArticle getAgreementArticleInfo(Long areaId) {
+        EtArticle etArticle = asArticleMapper.getAgreementArticleInfo(areaId);
+        return etArticle;
+    }
+
 //    /**
 //     * 查询动态分类及数量
 //     *

electripper-system/src/main/resources/mapper/system/AsArticleMapper.xml

@@ -110,6 +110,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where article_id = #{articleId}
     </select>
 
+    <select id="getAgreementArticleInfo" resultType="com.ruoyi.system.domain.EtArticle">
+        <include refid="selectAsArticleVo"/>
+        where area_id = #{areaId} and tag = 'agreement'
+    </select>
+
     <insert id="insertAsArticle" parameterType="EtArticle">
         insert into et_article
         <trim prefix="(" suffix=")" suffixOverrides=",">

electripper-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -234,7 +234,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
  			<if test="areaId != null">area_id = #{areaId},</if>
- 			<if test="dividendProportion != null">dividend_proportion = #{dividendProportion},</if>
+ 			<if test="dividendProportion != null and dividendProportion != 0">dividend_proportion = #{dividendProportion},</if>
  			<if test="dividendItem != null">dividend_item = #{dividendItem},</if>
  			<if test="appUserId != null">app_user_id = #{appUserId},</if>
  			<if test="cooperationTime != null">cooperation_time = #{cooperationTime},</if>