修改bug

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringCivilServiceImpl.java

@@ -117,7 +117,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     public TableDataInfo<ZEngineeringCivilVo> queryPageList(ZEngineeringCivilBo bo, PageQuery pageQuery) {
         Page<ZBuildingBo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
         Page<ZEngineeringCivilVo> result = baseMapper.queryPageList(bo,page,pageQuery.getPageNum(), pageQuery.getPageSize());
-        page.setTotal(result.getRecords() != null ? result.getRecords().get(0).getTotal():0);
+        page.setTotal(!ObjectUtils.isEmpty(result.getRecords())  ? result.getRecords().get(0).getTotal():0);
         return TableDataInfo.build(result);
     }
 

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringCivilMapper.xml

@@ -54,8 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join z_unit d on d.id = a.unit_id
         left join z_house e on e.id = a.house_id
         left join sys_dict_data f on f.dict_type = a.engin_type and f.dict_value = a.engin_classification
-        where a.del_flag = 0 AND a.id in (SELECT at.* FROM (SELECT a.id from z_engineering_civil a
-
+        where a.id in (SELECT at.* FROM (SELECT a.id from z_engineering_civil a
+        where a.del_flag = 0
         <if test="p.district != null and p.district != ''">
             and a.district = #{p.district}
         </if>