Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@@ -100,7 +100,9 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
         IPage<ScmWarehouse> page = PagerUtil.queryToPage(pq);
         IPage<ScmWarehouseVo> pagging = baseMapper.selectPageVo(page, qw);
         for (ScmWarehouseVo record : pagging.getRecords()) {
-            record.setWarehouseAttribute(record.getCity() + record.getCounty() + record.getWarehouseAttribute());
+            if (StringUtils.isNotBlank(record.getCity()) && StringUtils.isNotBlank(record.getCounty())){
+                record.setWarehouseAttribute(record.getCity() + record.getCounty() + record.getWarehouseAttribute());
+            }
         }
         PagerVo<ScmWarehouseVo> p = PagerUtil.pageToVo(pagging, null);
         return p;

yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java

@@ -32,10 +32,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.as.api.ascustomervehicle.AsCustomerCrmVehVo;
 import com.yxt.anrui.as.api.ascustomervehicle.AsCustomerVehicle;
 import com.yxt.anrui.as.api.ascustomervehicle.AsCustomerVehicleVo;
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
@@ -70,6 +67,6 @@ public interface AsCustomerVehicleMapper extends BaseMapper<AsCustomerVehicle> {
 
 	List<AsCustomerVehicleVo> selVehListByCustomerSid(@Param("sid") String sid);
 
-	@Delete("delete from as_customer_vehicle where sid =#{sid}")
+	@Update("update as_customer_vehicle set isDelete = '1' where sid =#{sid}")
 	void delBySid(@Param("sid") String sid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceMapper.java

@@ -29,10 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 import com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenance;
 import com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenanceVo;
 
@@ -67,6 +64,6 @@ public interface AsCustomervehMaintenanceMapper extends BaseMapper<AsCustomerveh
 	@Select("select * from as_customerveh_maintenance where vehSid =#{vehSid}")
     AsCustomervehMaintenance fetchByVehSid(@Param("vehSid") String vehSid);
 
-	@Delete("delete from as_customerveh_maintenance where vehSid =#{vehSid}")
+	@Update("update as_customerveh_maintenance set isDelete = '1' where vehSid =#{vehSid}")
 	void delByVehSid(@Param("vehSid") String vehSid);
 }

yxt-crm-biz/src/main/java/com/yxt/crm/feign/as/ascustomervehicle/AsCustomerVehicleFeign.java

@@ -17,7 +17,7 @@ import java.util.List;
 @FeignClient(
         contextId = "yxt-as-AsCustomerVehicle",
         name = "yxt-as",
-        path = "as/v1/ascustomervehicle",
+        path = "v1/ascustomervehicle",
         fallback = AsCustomerVehicleFeignFallback.class
 )
 public interface AsCustomerVehicleFeign {