地址

huimv-admin/src/main/java/com/huimv/admin/controller/BaseLocationController.java

@@ -31,11 +31,7 @@ public class BaseLocationController {
     public Result listAll(@RequestBody Map<String, String> paramsMap){
         String farmId = paramsMap.get("farmId");
         String vistitType = paramsMap.get("vistitType");
-        if (vistitType.equals("5")){
-            return new Result(ResultCode.SUCCESS,baseLocationService.list(new QueryWrapper<BaseLocation>().eq("farm_id",farmId).eq("vistit_type",vistitType).ne("parent_id",0)));
-        }else {
-            return new Result(ResultCode.SUCCESS,baseLocationService.list(new QueryWrapper<BaseLocation>().eq("farm_id",farmId).eq("vistit_type",vistitType)));
-        }
+        return new Result(ResultCode.SUCCESS,baseLocationService.list(new QueryWrapper<BaseLocation>().eq("farm_id",farmId).eq("vistit_type",vistitType)));
     }
 
     @PostMapping("/listLuggageLocation")

huimv-admin/src/main/java/com/huimv/admin/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -139,7 +139,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         //获取位置
         BaseLocation baseLocation;
         if (vistitType.equals("5")){
-            baseLocation = baseLocationMapper.selectOne(new QueryWrapper<BaseLocation>().eq("next_id", destId));
+            baseLocation = baseLocationMapper.selectById(destId);
         }else {
             baseLocation = baseLocationMapper.selectOne(new QueryWrapper<BaseLocation>().eq("farm_id", farmId).eq("vistit_type", vistitType).eq("parent_id", 0));
         }
@@ -164,7 +164,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             List<BillGoodsInventory> admissionAndGoods = objectMapper.readValue(goods, new TypeReference<List<BillGoodsInventory>>() {});
             for (BillGoodsInventory good : admissionAndGoods) {
                 good.setBillAdmission(billPersonnelAdmission.getId());
-                BaseLocation baseLocation1 = baseLocationMapper.selectOne(new QueryWrapper<BaseLocation>().eq("next_id", destId));
+                BaseLocation baseLocation1 = baseLocationMapper.selectById(destId);
                 good.setCurrentLocation(baseLocation1.getLocationName());
                 good.setCurrentLocationId(baseLocation1.getId());
                 billGoodsInventoryMapper.insert(good);
@@ -260,13 +260,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             String locationId = baseProcess.getCurrentLocationId();
             String[] strings = locationId.split(",");
             String laseLocationId = strings[strings.length-1];
-            BaseLocation baseLocation;
-            System.out.println(billPersonnelAdmission.getDestId());
-            if (!(billPersonnelAdmission.getDestId() == 9)){
-                baseLocation = baseLocationMapper.selectById(laseLocationId);
-            }else {
-                baseLocation = baseLocationMapper.selectById(billPersonnelAdmission.getDestId());
-            }
+            BaseLocation baseLocation = baseLocationMapper.selectById(laseLocationId);
             if (userType == 3) {
                 String[] split = baseProcess.getCurrentStatus().split(",");
                 split[split.length-1]="1";