Browse Source

人防概览下钻接口bug修改

master
sunyuchao 3 years ago
parent
commit
304fd62c86
  1. 2
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
  2. 8
      epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

2
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@ -629,7 +629,7 @@
)
</otherwise>
</choose>
GROUP BY
ORDER BY
a.sort,
CONVERT(c.NEIGHBOR_HOOD_NAME using gbk),
CONVERT(b.BUILDING_NAME USING gbk),

8
epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@ -1313,6 +1313,12 @@
del_flag = '0'
AND status = '0'
AND customer_id = #{customerId}
<if test='null != type and type.trim() != "" and type == "cz" '>
AND is_floating = '0'
</if>
<if test='null != type and type.trim() != "" and type == "ld" '>
AND (is_floating != '0' or is_floating is null)
</if>
<choose>
<when test='orgType == "agency"'>
AND (agency_id = #{orgId} OR pids LIKE CONCAT('%', #{orgId}, '%'))
@ -1334,7 +1340,7 @@
AND village_id = #{orgId}
</otherwise>
</choose>
GROUP BY `name` ASC
ORDER BY `name` ASC
</select>
</mapper>

Loading…
Cancel
Save