1

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionViewServiceImpl.java

@@ -260,7 +260,7 @@ public class CenterdataTHousingconstructionViewServiceImpl extends BaseServiceIm
                 for (Map<String, Object> realnameuserMap : realnameuserList) {
                     List<String> strings = new ArrayList<>();
                     for (Map<String, Object> steelcylinderMap : steelcylinderList) {
-                        if (steelcylinderMap.get("joinHouseId").toString().equals(realnameuserMap.get("id").toString())) {
+                        if (steelcylinderMap.get("joinHouseId")!=null&&steelcylinderMap.get("joinHouseId").toString().equals(realnameuserMap.get("id").toString())) {
                             strings.add(steelcylinderMap.get("steelcylinderName").toString());
                         }
                     }

src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionViewMapper.xml

@@ -490,10 +490,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     a.steelcylinder_id
                     ) d ON l.steelcylinder_id = d.steelcylinder_id
         LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = u.dept_id
-        <where>
+        where l.recycling_time is null
             <if test="enterpriseId != null  and enterpriseId != ''"> and u.enterprise_id = #{enterpriseId}</if>
             <if test="name != null  and name != ''"> and l.steelcylinder_name = #{name}</if>
-        </where>
         GROUP BY l.steelcylinder_id
         <if test="radius != null">having distance &lt; #{radius}</if>
     </select>