1

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

@@ -161,7 +161,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a.id, a.dept_id deptId, a.dept_name deptName, a.enterprise_id enterpriseId,a.enterprise_name enterpriseName,
                a.car_number carNumber, a.manager_id managerId, a.manager_name managerName, a.driver_id driverId,
                a.driver_name driverName, a.escort_id escortId, a.escort_name escortName, a.emergency_equipment emergencyEquipment,
-        a.protection, a.speed from centerdata_t_housingconstruction_car a
+        a.protection, a.speed, b.phone from centerdata_t_housingconstruction_car a
+        left join centerdata_t_housingconstruction_delivery_personnel b on a.escort_id = b.id
         left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
         <where>
             <if test="enterpriseId != null  and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>

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

@@ -462,8 +462,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="enterpriseId != null  and enterpriseId != ''"> and u.enterprise_id = #{enterpriseId}</if>
             <if test="name != null  and name != ''"> and l.steelcylinder_name like concat('%', #{name}, '%')</if>
+            and u.longitude is not null
         </where>
-        GROUP BY join_house_id
+        GROUP BY l.steelcylinder_id
         <if test="radius != null">having distance &lt; #{radius}</if>
     </select>