Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -228,7 +228,11 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         //备注
         String remarks1 = createRemarks(dto);
         String remarks2 = baseVehicleOut.getRemarks();
-        baseVehicleOut.setRemarks(remarks2 + remarks1);
+        String remarks3 = remarks2 + remarks1;
+        if ("null".equals(remarks3)){
+            remarks3 = "";
+        }
+        baseVehicleOut.setRemarks(remarks3);
         BaseVehicleOutApply baseVehicleOutApply = new BaseVehicleOutApply();
         baseVehicleOutApply.setBillNo(billNo);
         baseVehicleOutApply.setSaleDate(dto.getSaleDate());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java

@@ -198,7 +198,7 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
         ResultBean<List<FinManufacturerVo>> rb = ResultBean.fireFail();
         String useOrgSid = "";
         if(StringUtils.isNotBlank(orgPath)){
-            useOrgSid = sysStaffOrgFeign.getOrgSidByPath(userSid).getData();
+            useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }else{
             useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         }