紧急入场申请

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

@@ -473,8 +473,13 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             //获取下一步位置
             String allLocationId = baseProcess.getAllLocationId();
             String[] strings = allLocationId.split(",");
-            String nextLocationId = strings[1];
-            BaseLocation baseLocation = baseLocationMapper.selectById(nextLocationId);
+            String nextLocationId;
+            BaseLocation baseLocation = new BaseLocation();
+            if (billPersonnelAdmission.getAdmissionType() == 0){
+                nextLocationId = strings[1];
+                baseLocation = baseLocationMapper.selectById(nextLocationId);
+            }
+
 
             if (userType == 3) {
                 String[] split = baseProcess.getCurrentStatus().split(",");