修改业务bug

sp-admin/sa-view/tb-business/tb-car-disincle-edit.html

@@ -262,8 +262,6 @@
 									.carType) !== -1);
 							}
 							this.items = list;
-							this.checkList = list.filter(obj => obj.need == 1 || obj.itemType.indexOf(this.m
-								.carType) !== -1).map(obj => obj.id);
 							let businessItems = this.businessItems;
 							list.forEach(obj => {
 								businessItems.forEach(item => {

sp-server/src/main/java/com/pj/api/service/ApiService.java

@@ -337,8 +337,8 @@ public class ApiService {
                 .setNo(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmm")) + RandomUtil.randomNumbers(4));
         tbBusinessCarService.saveOrUpdate(db);
         TbBusiness tbBusiness = new TbBusiness();
-      SpAdmin spAdmin=  StpUserUtil.getAdmin();
-        String createName=StrUtil.isEmpty(spAdmin.getNickname())?spAdmin.getName():spAdmin.getNickname();
+        SpAdmin spAdmin = StpUserUtil.getAdmin();
+        String createName = StrUtil.isEmpty(spAdmin.getNickname()) ? spAdmin.getName() : spAdmin.getNickname();
         tbBusiness.setCreateBy(createName);
         tbBusiness.setBusinessCarId(db.getId()).setPayStep(tbItemType.getPayStep());
         TbCostomer tbCostomer = tbCostomerService.getById(customerId);
@@ -420,10 +420,10 @@ public class ApiService {
         }
         String no = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmm")) + RandomUtil.randomNumbers(4);
         TbBusinessCar tbBusinessCar = tbBusinessCarService.getById(tbBusiness.getBusinessCarId());
-        TbBusinessCar otherCar = tbBusinessCarService.searchOtherBusinessCarNotOut(carNo);
-        if (otherCar != null) {
+        if (!StrUtil.equals(tbBusinessCar.getCarNo(), carNo)) {
+            TbBusinessCar otherCar = tbBusinessCarService.searchOtherBusinessCarNotOut(carNo);
             List<TbBusiness> checkList = tbBusinessService.findOtherBusinessByCarId(tbBusiness.getBusinessCarId());
-            if (checkList.size() == 1) {
+            if (checkList.size() == 1&&tbBusiness.getRealInTime()==null) {
                 tbBusinessCarService.removeById(tbBusiness.getBusinessCarId());
             }
             tbBusiness.setBusinessCarId(otherCar.getId());