BUG修改

src/main/java/com/bonus/gzcar/business/backstage/mapper/CarSupMapper.java

@@ -85,4 +85,6 @@ public interface CarSupMapper {
      * @return
      */
     List<CarSupVo> getContractSupList(CarSupVo data);
+
+    int getUserBySup(CarSupVo data);
 }

src/main/java/com/bonus/gzcar/business/backstage/service/CarCarServiceImpl.java

@@ -325,10 +325,6 @@ public class CarCarServiceImpl implements CarCarService {
     @Override
     public ServerResponse deleteCarData(CarCarVo data) {
         try{
-            int nums=mapper.getUserBySup(data);
-            if(nums>0){
-                return ServerResponse.createBySuccessMsg("供应商下存在车辆信息不允许删除!");
-            }
             int num=mapper.deleteCarData(data);
             uploadService.deleteFileByTableId(data.getId(),"car_supplier_info");
             if(num>0){

src/main/java/com/bonus/gzcar/business/backstage/service/CarSupServiceImpl.java

@@ -96,6 +96,10 @@ public class CarSupServiceImpl implements CarSupService{
     @Override
     public ServerResponse deleteCarSup(CarSupVo data) {
         try{
+            int nums=mapper.getUserBySup(data);
+            if(nums>0){
+                return ServerResponse.createBySuccessMsg("供应商下存在车辆信息不允许删除!");
+            }
             int num=mapper.deleteCarSup(data);
             if(num>0){
                 return ServerResponse.createSuccess("删除成功","删除成功");
@@ -103,7 +107,7 @@ public class CarSupServiceImpl implements CarSupService{
         }catch (Exception e){
             log.error(e.toString(),e);
         }
-        return ServerResponse.createErroe("修改失败");
+        return ServerResponse.createErroe("删除失败");
     }
 
     @Override

src/main/resources/mappers/business/backstage/CarSupMapper.xml

@@ -90,4 +90,9 @@
              and ccr.type=#{type}
         </if>
     </select>
+    <select id="getUserBySup" resultType="java.lang.Integer">
+            select  count(1)
+            from car_supplier_info
+            where is_active=1  and sup_id=#{id}
+    </select>
 </mapper>

src/main/resources/mappers/business/backstage/CarTypeMapper.xml

@@ -11,13 +11,10 @@
                   #{creator},now(),#{updater},now())
     </insert>
     <update id="updateTypeData">
-        update      car_ma_type set   name=#{name}
+        update      car_ma_type set   name=#{name}  ,remark=#{remark}
             <if test="unit!=null and unit!=''">
                 ,unit_name=#{unit}
             </if>
-        <if test="remark!=null and remark!=''">
-            ,remark=#{remark}
-        </if>
          where id=#{id}
     </update>
     <update id="updateTypeStatus">