Browse Source

修改:

1.社区搜索(居民):conditions为null的bug
2.社区搜索(房屋):逻辑错误
master
wangxianzhang 4 years ago
parent
commit
69407626f2
  1. 2
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
  2. 1
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

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

@ -130,7 +130,7 @@
LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID and d.DEL_FLAG = '0'
<where>
<if test="pids != null and pids != ''">
AND c.AGENCY_PIDS like CONCAT(#{pids},'%')
AND CONCAT(c.AGENCY_PIDS,':',c.AGENCY_ID) like CONCAT(#{pids},'%')
</if>
<if test="buildingId != null and buildingId.trim() != ''">
AND a.BUILDING_ID = #{buildingId}

1
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@ -660,6 +660,7 @@ public class IcResiUserController {
input.setCustomerId(loginUser.getCustomerId());
input.setStaffId(loginUser.getUserId());
input.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
input.setConditions(new ArrayList<>());
if (input.getPageNo() == null) {
input.setPageNo(NumConstant.ONE);
}

Loading…
Cancel
Save