FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'origin/Three' into 'develop_master'

Browse Source 
Origin/three

See merge request LiuChao/foton-slrs-system-rest!274
This commit is contained in:
super_liu
2021-12-08 15:51:11 +08:00
parent c53b405891 d9f7c7ea8b
commit 867f147edb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml
+3 -3
View File
@@ -21,7 +21,7 @@
and name like concat('%',#{name},'%') and name like concat('%',#{name},'%')
</if> </if>
<if test="project_id != null and project_id != ''"> <if test="project_id != null and project_id != ''">
and project_id = #{project_id} and project_id = #{projectId}
</if> </if>
<if test="project_name != null and project_name != ''"> <if test="project_name != null and project_name != ''">
and project_name = #{project_name} and project_name = #{project_name}
@@ -111,7 +111,7 @@
name = #{name}, name = #{name},
</if> </if>
<if test="project_id != null and project_id != ''"> <if test="project_id != null and project_id != ''">
project_id = #{project_id}, project_id = #{projectId},
</if> </if>
<if test="project_name != null and project_name != ''"> <if test="project_name != null and project_name != ''">
project_name = #{project_name}, project_name = #{project_name},
@@ -254,7 +254,7 @@
#{name}, #{name},
</if> </if>
<if test="project_id != null and project_id != ''"> <if test="project_id != null and project_id != ''">
#{project_id}, #{projectId},
</if> </if>
<if test="project_name != null and project_name != ''"> <if test="project_name != null and project_name != ''">
#{project_name}, #{project_name},