修改图片样式

liujun001
1 parent d28de956
Showing 2 changed files with 6 additions and 1 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-unit/src/main/resources/mapper/unit/TransportationEnterpriseMapper.xml
@@ -713,6 +713,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     private void handleDistance(TransportationEnterpriseVo vo, GarAddress address) {
+        if(Objects.isNull(vo) || StringUtils.isEmpty(vo.getOfficeAddressGps()) || StringUtils.indexOf(vo.getOfficeAddressGps(),",")==-1 || Objects.isNull(address)){
+            vo.setDistance(9999999);
+            return;
+        }
         String[] params = vo.getOfficeAddressGps().split(",");
         double distance = calculateDistance(Double.parseDouble(params[1]), Double.parseDouble(params[0]), address.getGarLatitude(), address.getGarLongitude());
         vo.setDistance(distance);
@@ -50,7 +50,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     <select id="selectTransportationEnterpriseList" parameterType="TransportationEnterprise" resultMap="TransportationEnterpriseResult">
         <include refid="selectTransportationEnterpriseVo"/>
-        <where>  
+        <where>
+            <if test="id != null  and id != ''"> and id = #{id}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="abbreviation != null  and abbreviation != ''"> and abbreviation = #{abbreviation}</if>
             <if test="registrationArea != null  and registrationArea != ''"> and registration_area = #{registrationArea}</if>