Commit ec0b50a7 authored by 廖旭伟's avatar 廖旭伟

修改协议管理新增bug

parent 8d884ab7
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
a.siteId, a.siteId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
a.name, a.`name`,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('describe') or colPickMode == 1 and data.containsKey('describe')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('describe') or colPickMode == 1 and data.containsKey('describe')))">
a.describe, a.`describe`,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('content') or colPickMode == 1 and data.containsKey('content')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('content') or colPickMode == 1 and data.containsKey('content')))">
a.content, a.content,
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="SstAgreementEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="SstAgreementEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_sst_agreement insert into mortals_xhx_sst_agreement
(siteId,name,describe,content,createUserId,createTime,updateUserId,updateTime) (siteId,`name`,`describe`,content,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
(#{siteId},#{name},#{describe},#{content},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{siteId},#{name},#{describe},#{content},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert> </insert>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_sst_agreement insert into mortals_xhx_sst_agreement
(siteId,name,describe,content,createUserId,createTime,updateUserId,updateTime) (siteId,`name`,`describe`,content,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.name},#{item.describe},#{item.content},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.siteId},#{item.name},#{item.describe},#{item.content},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
...@@ -81,10 +81,10 @@ ...@@ -81,10 +81,10 @@
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement}, a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))"> <if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))">
a.name=#{data.name}, a.`name`=#{data.name},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('describe')) or (colPickMode==1 and !data.containsKey('describe'))"> <if test="(colPickMode==0 and data.containsKey('describe')) or (colPickMode==1 and !data.containsKey('describe'))">
a.describe=#{data.describe}, a.`describe`=#{data.describe},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('content')) or (colPickMode==1 and !data.containsKey('content'))"> <if test="(colPickMode==0 and data.containsKey('content')) or (colPickMode==1 and !data.containsKey('content'))">
a.content=#{data.content}, a.content=#{data.content},
...@@ -351,14 +351,14 @@ ...@@ -351,14 +351,14 @@
<if test="conditionParamRef.containsKey('name')"> <if test="conditionParamRef.containsKey('name')">
<if test="conditionParamRef.name != null and conditionParamRef.name != ''"> <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
${_conditionType_} a.name like #{${_conditionParam_}.name} ${_conditionType_} a.`name` like #{${_conditionParam_}.name}
</if> </if>
<if test="conditionParamRef.name == null"> <if test="conditionParamRef.name == null">
${_conditionType_} a.name is null ${_conditionType_} a.`name` is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('nameList')"> <if test="conditionParamRef.containsKey('nameList')">
${_conditionType_} a.name in ${_conditionType_} a.`name` in
<foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
...@@ -366,14 +366,14 @@ ...@@ -366,14 +366,14 @@
<if test="conditionParamRef.containsKey('describe')"> <if test="conditionParamRef.containsKey('describe')">
<if test="conditionParamRef.describe != null and conditionParamRef.describe != ''"> <if test="conditionParamRef.describe != null and conditionParamRef.describe != ''">
${_conditionType_} a.describe like #{${_conditionParam_}.describe} ${_conditionType_} a.`describe` like #{${_conditionParam_}.describe}
</if> </if>
<if test="conditionParamRef.describe == null"> <if test="conditionParamRef.describe == null">
${_conditionType_} a.describe is null ${_conditionType_} a.`describe` is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('describeList')"> <if test="conditionParamRef.containsKey('describeList')">
${_conditionType_} a.describe in ${_conditionType_} a.`describe` in
<foreach collection="conditionParamRef.describeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.describeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
...@@ -489,12 +489,12 @@ ...@@ -489,12 +489,12 @@
, ,
</if> </if>
<if test="orderCol.containsKey('name')"> <if test="orderCol.containsKey('name')">
a.name a.`name`
<if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if> <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('describe')"> <if test="orderCol.containsKey('describe')">
a.describe a.`describe`
<if test='orderCol.describe != null and "DESC".equalsIgnoreCase(orderCol.describe)'>DESC</if> <if test='orderCol.describe != null and "DESC".equalsIgnoreCase(orderCol.describe)'>DESC</if>
, ,
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment