Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -56,8 +56,8 @@ import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.DateUtils;
-import com.yxt.common.base.utils.MoneyToChineseUtils;
 import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.TransformMoney;
 import com.yxt.common.base.utils.WordConvertUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -1340,8 +1340,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         String insuranceInfo = "保险说明：" + appOrderDetailsVo.getInsuranceInfo() + "。";
         //车价合计
         String totalPrice = priceInfo.getTotalPrice();
+        String priceRemarks = "";
         //车价合计大写
-        String priceRemarks = MoneyToChineseUtils.convert(Double.valueOf(totalPrice).doubleValue());
+//        String priceRemarks = MoneyToChineseUtils.convert(Double.valueOf(totalPrice).doubleValue());
+        if(StringUtils.isNotBlank(totalPrice)){
+            priceRemarks = TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(totalPrice).doubleValue()));
+        }
         //交纳订金
         AppOrderDepositInfoVo depositInfo = appOrderDetailsVo.getDepositInfo();
         String depositTotal = depositInfo.getDepositTotal();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -65,7 +65,6 @@ import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
-import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinSelectDto;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
@@ -2027,7 +2026,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                     finConfirmDto.setBanlance(busDeposit.getDeposit().toString());
                     //创建人sid
                     finConfirmDto.setCreateBySid(busMainDeposit.getCreateBySid());
-                    List<FinSelectDto> list = new ArrayList<>();
+                    finConfirmDto.setPushMessgae(1);
+                    finConfirmDto.setBusSid(busMainDeposit.getSid());
+                    finConfirmDto.setBusNo(busMainDeposit.getBillNo());
+                  /*  List<FinSelectDto> list = new ArrayList<>();
                     if (StringUtils.isNotBlank(busDeposit.getVehicleNum())) {
                         List<BusDepositCustomerVo> customerList = busDepositCustomerService.selectListByBillSid(bv.getBusinessSid());
                         for (int i = 0; i < Integer.valueOf(busDeposit.getVehicleNum()); i++) {
@@ -2044,7 +2046,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                             }
                         }
                     }
-                    finConfirmDto.setFinSelectList(list);
+                    finConfirmDto.setFinSelectList(list);*/
                     finCollectionConfirmationFeign.saveFinConfirm(finConfirmDto);
                 }
                 if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -42,6 +42,7 @@ import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
 import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
@@ -91,6 +92,8 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
     private BusDepositService busDepositService;
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
 
     public String saveOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {
         BusSalesOrderDeposit busSalesOrderDeposit = new BusSalesOrderDeposit();
@@ -336,6 +339,13 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
                     qw.eq("bd.staffSid", resultBean.getData().getStaffSid());
                 }
             }
+            //查询已审核通过的款项确认
+            ResultBean<List<String>> stringList = finCollectionConfirmationFeign.billeNoList();
+            if(stringList.getSuccess()){
+                if(!stringList.getData().isEmpty()){
+                    qw.in("bmd.billNo",stringList.getData());
+                }
+            }
         }
         qw.eq("bmd.nodeState", FlowComment.SETTLE.getRemark());//已办结
         qw.eq("bmd.depositBillTypeKey", "01");

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java

@@ -84,4 +84,11 @@ public class FinCollectionConfirmation extends BaseEntity {
     private Integer auditState; // 审核状态
     @ApiModelProperty("款项状态（1未认款/2部分认款/3已认款）")
     private Integer paymentState; // 审核状态
+
+    @ApiModelProperty("是否是推送的：0否，1是")
+    private int pushMessgae;
+    @ApiModelProperty("业务sid")
+    private String busSid;
+    @ApiModelProperty("业务单据编号")
+    private String busNo;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -35,6 +35,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(销售相关) <br/>
  * File: FinCollectionConfirmationFeign.java <br/>
@@ -114,5 +116,9 @@ public interface FinCollectionConfirmationFeign {
     @PostMapping("/saveFinConfirm")
     ResultBean saveFinConfirm(@RequestBody FinConfirmDto dto);
 
+    @ApiOperation("查询已审核通过的款项确认的业务编号")
+    @GetMapping("/billeNoList")
+    ResultBean<List<String>> billeNoList();
+
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@@ -32,6 +32,8 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(销售相关) <br/>
  * File: FinCollectionConfirmationFeignFallback.java <br/>
@@ -119,4 +121,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     public ResultBean saveFinConfirm(FinConfirmDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<String>> billeNoList() {
+        return null;
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java

@@ -52,4 +52,11 @@ public class FinConfirmDto implements Dto {
 
     private String banlance;
 
+    @ApiModelProperty("是否是推送的：0否，1是")
+    private int pushMessgae;
+    @ApiModelProperty("业务sid")
+    private String busSid;
+    @ApiModelProperty("业务单据编号")
+    private String busNo;
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@@ -31,7 +31,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
-import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -96,4 +95,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
      * @return
      */
     AppFinCollectionConfirmationDetailedVo getCollectionConfirmDetail(String collectionBillSid);
+
+    List<String> billNoList();
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -70,4 +70,8 @@
         FROM fin_collection_confirmation
         WHERE sid = #{collectionBillSid}
     </select>
+
+    <select id="billNoList" resultType="java.lang.String">
+        select busNo from fin_collection_confirmation where pushMessgae = 1 and auditState = 3
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@@ -39,6 +39,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(销售相关) <br/>
  * File: FinCollectionConfirmationFeignFallback.java <br/>
@@ -193,4 +195,9 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     public ResultBean saveFinConfirm(FinConfirmDto dto) {
         return finCollectionConfirmationService.saveFinConfirm(dto);
     }
+
+    @Override
+    public ResultBean<List<String>> billeNoList() {
+        return finCollectionConfirmationService.billNoList();
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -389,6 +389,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 qw.like("payerName", pagerQuery.getName());
             }
         }
+        qw.eq("pushMessage",0);
         return qw;
     }
 
@@ -753,4 +754,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         return rb.success();
     }
+
+    public ResultBean<List<String>> billNoList() {
+        ResultBean<List<String>> rb = ResultBean.fireFail();
+        List<String> stringList = baseMapper.billNoList();
+        return rb.success().setData(stringList);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json

@@ -54,7 +54,7 @@
     "FCountCycle": "1",
     "FCountDay": 1,
     "FIsMustCounting": false,
-    "FIsBatchManage": false,
+    "FIsBatchManage": true,
     "FIsKFPeriod": false,
     "FIsExpParToFlot": false,
     "FCurrencyId": {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java

@@ -177,7 +177,7 @@ public class STKInStockService extends FinKingDeeService {
         JSONObject jsonObject = JSONObject.parseObject(data);
         String documentStatus = (String)jsonObject.get("DocumentStatus");
         log.info("getStinstockState-documentStatus:{}",documentStatus);
-        return rb.setData("C".equals(documentStatus));
+        return rb.success().setData("C".equals(documentStatus));
     }
     /**
      * 单据查询

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionMapper.java

@@ -26,17 +26,19 @@ import java.util.List;
 @Mapper
 public interface AppSubsetVersionMapper extends BaseMapper<AppSubsetVersion> {
 
-	List<AppSubsetVersionVo> selectVersionList(@Param("linkSid") String linkSid,@Param("path") String path);
+    List<AppSubsetVersionVo> selectVersionList(@Param("linkSid") String linkSid, @Param("path") String path);
 
-	AppSubsetVersionVo selectByAppSid(String appSid);
+    List<AppSubsetVersionVo> selectVersionListOne(@Param("linkSid") String linkSid, @Param("path") String path, @Param("list") List<String> stringList);
 
-	@Select("SELECT * FROM app_subset_version WHERE modulePluginName=#{modulePluginName} ORDER BY id DESC LIMIT 1")
-	AppSubsetVersionVo getLastBymodulePluginName(@Param("modulePluginName") String modulePluginName);
+    AppSubsetVersionVo selectByAppSid(String appSid);
 
-	@Select("SELECT * FROM app_subset_version WHERE appSid=#{appSid} ORDER BY id DESC LIMIT 1")
-	AppSubsetVersionVo getLastByAppSid(@Param("appSid") String appSid);
+    @Select("SELECT * FROM app_subset_version WHERE modulePluginName=#{modulePluginName} ORDER BY id DESC LIMIT 1")
+    AppSubsetVersionVo getLastBymodulePluginName(@Param("modulePluginName") String modulePluginName);
 
-	AppSubsetVersionVo selectByAppSidOne(String s);
+    @Select("SELECT * FROM app_subset_version WHERE appSid=#{appSid} ORDER BY id DESC LIMIT 1")
+    AppSubsetVersionVo getLastByAppSid(@Param("appSid") String appSid);
 
-	List<AppIndexAppNumVo> selectAppNum(String linkSid);
+    AppSubsetVersionVo selectByAppSidOne(String s);
+
+    List<AppIndexAppNumVo> selectAppNum(String linkSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionMapper.xml

@@ -24,6 +24,34 @@
           AND id IN (SELECT MAX(id) FROM app_subset_version GROUP BY appSid)
         ORDER BY sortNo ASC
     </select>
+
+    <select id="selectVersionListOne" resultType="com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo">
+        SELECT asv.sortNo,
+        asv.appName,
+        asv.appSid,
+        asv.versionCode,
+        concat(#{path}, asv.iconUrl)   iconUrl,
+        asv.linkSid,
+        asv.versionName,
+        concat(#{path}, asv.updateUrl) updateUrl,
+        asv.upgradeInfo,
+        asv.type,
+        asv.modulePluginName,
+        asv.sourcePackage,
+        asv.sourceAction,
+        asv.sourceSid,
+        asv.`id`
+        FROM app_subset_version asv
+        WHERE linkSid = #{linkSid}
+        AND id IN (SELECT MAX(id) FROM app_subset_version GROUP BY appSid)
+        <if test="list != null and list.size()!=0">
+            and asv.appSid in
+            <foreach item="appSid" collection="list" open="(" separator="," close=")">
+                #{appSid}
+            </foreach>
+        </if>
+        ORDER BY sortNo ASC
+    </select>
     <select id="selectByAppSid" resultType="com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo">
         SELECT versionCode
         FROM app_subset_version

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionService.java

@@ -28,6 +28,10 @@ public class AppSubsetVersionService extends MybatisBaseService<AppSubsetVersion
 		return baseMapper.selectVersionList(linkSid,path);
 	}
 
+	public List<AppSubsetVersionVo> selectVersionListOne(String linkSid,String path,List<String> stringList) {
+		return baseMapper.selectVersionListOne(linkSid,path,stringList);
+	}
+
 	public AppSubsetVersionVo selectByAppSid(String appSid) {
 		return baseMapper.selectByAppSid(appSid);
 	}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java

@@ -90,7 +90,11 @@ public class AppIndexRest implements AppIndexFeign {
         // 子应用列表
         String linkSid = LINKSID;
         String path = fileUploadComponent.getUrlPrefix();
-        List<AppSubsetVersionVo> subsetVersionVoList = appSubsetVersionService.selectVersionList(linkSid, path);
+        //查询用户的权限
+        //查询该用户是否有权限
+        List<String> stringList = sysMobileMenuRoleService.selectAppSidList(userSid);
+//        List<AppSubsetVersionVo> subsetVersionVoList = appSubsetVersionService.selectVersionList(linkSid, path);
+        List<AppSubsetVersionVo> subsetVersionVoList = appSubsetVersionService.selectVersionListOne(linkSid, path,stringList);
         subsetVersionVoList.stream().forEach(item -> {
             /*if ("98ff0724-5df4-4fc7-ab6d-3996e7706acd".equals(item.getAppSid())) {
                 //供应链

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleMapper.java

@@ -56,4 +56,5 @@ public interface SysMobileMenuRoleMapper extends BaseMapper<SysMobileMenuRole> {
     List<AppIndexNewListVo> appRoleMenu(@Param("path") String path, @Param("roleSids") List<String> roleSids, @Param("titleGroup") String titleGroup, @Param("appSid") String appSid);
 
     List<String> selectMenuList(@Param("userSid") String userSid, @Param("appSid") String appSid);
+    List<String> selectAppSidList(@Param("userSid") String userSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleMapper.xml

@@ -71,4 +71,12 @@
         where sr.userSid = #{userSid}
           and smm.linkSid = #{appSid}
     </select>
+
+    <select id="selectAppSidList" resultType="java.lang.String">
+        select distinct smm.linkSid
+        from sys_mobile_menu smm
+        left join sys_mobile_menu_role smr on smm.sid = smr.menuSid
+        left join sys_user_role sr on sr.roleSid = smr.roleSid
+        where sr.userSid = #{userSid}
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleService.java

@@ -150,4 +150,9 @@ public class SysMobileMenuRoleService extends MybatisBaseService<SysMobileMenuRo
         List<String> stringList = baseMapper.selectMenuList(userSid, appSid);
         return stringList;
     }
+
+    public List<String> selectAppSidList(String userSid) {
+        List<String> stringList = baseMapper.selectAppSidList(userSid);
+        return stringList;
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -54,7 +54,6 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*;
@@ -562,14 +561,18 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     ResultBean<BaseVehicle> baseVehicleResultBean = baseVehicleFeign.selectByVinNoAndOrgSid(scmVehicleEnterlibrary.getVinNo(), internalPurchaseDetailsVo.getSellerOrgSid());
                     //厂家回款通路sid 厂家回款通路名称
                     if (baseVehicleResultBean.getData() != null) {
-                        baseVehicleDto.setManufSaleAccessSid(baseVehicleResultBean.getData().getManufSaleAccessSid());
-                        baseVehicleDto.setManufSaleAccessName(baseVehicleResultBean.getData().getManufSaleAccessName());
-                        //厂家回款通路类别key
-                        BaseManufacturerBankVo baseManufacturerBankVo = baseManufacturerBankFeign.details(baseVehicleResultBean.getData().getManufSaleAccessSid()).getData();
-                        if (baseManufacturerBankVo != null) {
-                            baseVehicleDto.setManufSaleAccessKey(baseManufacturerBankVo.getActualPayKey());
-                            //付款通路code
-                            baseVehicleDto.setPaymentAccessNoKey(baseManufacturerBankVo.getPaymentAccessNoKey());
+                        if(StringUtils.isNotBlank(baseVehicleResultBean.getData().getManufSaleAccessSid())){
+                            baseVehicleDto.setManufSaleAccessSid(baseVehicleResultBean.getData().getManufSaleAccessSid());
+                            //厂家回款通路类别key
+                            BaseManufacturerBankVo baseManufacturerBankVo = baseManufacturerBankFeign.details(baseVehicleResultBean.getData().getManufSaleAccessSid()).getData();
+                            if (baseManufacturerBankVo != null) {
+                                baseVehicleDto.setManufSaleAccessKey(baseManufacturerBankVo.getActualPayKey());
+                                //付款通路code
+                                baseVehicleDto.setPaymentAccessNoKey(baseManufacturerBankVo.getPaymentAccessNoKey());
+                            }
+                        }
+                        if(StringUtils.isNotBlank(baseVehicleResultBean.getData().getManufSaleAccessName())){
+                            baseVehicleDto.setManufSaleAccessName(baseVehicleResultBean.getData().getManufSaleAccessName());
                         }
                     }
                     List<BaseVehicleDto> list = new ArrayList<>();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -202,7 +202,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
             qw.eq("sve.useOrgSid", query.getUseOrgSid());
         }
         if (StringUtils.isNotBlank(query.getVin())) {
-            qw.eq("sve.vinNo", query.getVin());
+            qw.like("sve.vinNo", query.getVin());
         }
         if (StringUtils.isNotBlank(query.getModel())) {
             qw.eq("sve.modelName", query.getModel());
@@ -508,6 +508,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                 for (String s : factoryImage) {
                     if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                         s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }else{
+                        s1 = s;
                     }
                     ScmFile scmFile1 = new ScmFile();
                     scmFile1.setAttachType(type1);
@@ -521,6 +523,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                 for (String s : carInspectedImage) {
                     if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                         s2 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }else{
+                        s2 = s;
                     }
                     ScmFile scmFile2 = new ScmFile();
                     scmFile2.setAttachType(type2);