Skip to content

A
amos-boot-biz
Commit 469ff0f2 authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'develop_tzs_register_test' into develop_tzs_register

# Conflicts: # amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
parents 3d2e21ab 92e355d9
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 11 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml
View file @ 469ff0f2
...@@ -75,11 +75,11 @@ ...@@ -75,11 +75,11 @@
</if> </if>
<if test="param.orgBranchCode != null and param.orgBranchCode != ''"> <if test="param.orgBranchCode != null and param.orgBranchCode != ''">
<choose> <choose>
<when test="client == 'jgAudit'"> <when test="client == 'jgLook'">
AND isn.org_branch_code= #{param.orgBranchCode} AND isn.org_branch_code LIKE concat(#{param.orgBranchCode},'%')
</when> </when>
<otherwise> <otherwise>
AND isn.org_branch_code LIKE concat(#{param.orgBranchCode},'%') AND isn.org_branch_code= #{param.orgBranchCode}
</otherwise> </otherwise>
</choose> </choose>
</if> </if>
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ 469ff0f2
...@@ -267,13 +267,11 @@ ...@@ -267,13 +267,11 @@
</if> </if>
<if test="dto.orgBranchCode != null and dto.orgBranchCode != ''"> <if test="dto.orgBranchCode != null and dto.orgBranchCode != ''">
<choose> <choose>
<when test="client == 'jgAudit'"> <when test="client == 'jgLook'">
and supervisionOrgCode = #{dto.orgBranchCode} and supervisionOrgCode like concat(#{dto.orgBranchCode},'%')
</when> </when>
<otherwise> <otherwise>
and supervisionOrgCode like concat(#{dto.orgBranchCode},'%') and supervisionOrgCode = #{dto.orgBranchCode}
</otherwise> </otherwise>
</choose> </choose>
</if> </if>
...@@ -350,11 +348,11 @@ ...@@ -350,11 +348,11 @@
</if> </if>
<if test="dto.orgBranchCode != null and dto.orgBranchCode != ''"> <if test="dto.orgBranchCode != null and dto.orgBranchCode != ''">
<choose> <choose>
<when test="client == 'jgAudit'"> <when test="client == 'jgLook'">
and supervision_org_code = #{dto.orgBranchCode} and supervisionOrgCode like concat(#{dto.orgBranchCode},'%')
</when> </when>
<otherwise> <otherwise>
and supervision_org_code like concat(#{dto.orgBranchCode},'%') and supervisionOrgCode = #{dto.orgBranchCode}
</otherwise> </otherwise>
</choose> </choose>
</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