组织机构及人员调用平台顺序调整，现在调用顺序为业务-平台-业务

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/StationBasicServiceImpl.java

@@ -95,15 +95,6 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
     @Transactional
     public void add(StationBasic  stationBasic)   {
 
-        //平台增加场站
-        CompanyModel companyModeldata=new CompanyModel();
-        companyModeldata.setCompanyName(stationBasic.getStationName());
-        companyModeldata.setCompanyType("company");
-        companyModeldata.setLevel("station");
-        companyModeldata.setParentId(Long.valueOf(stationBasic.getArea()));
-        companyModeldata.setCompanyCode(stationBasic.getStationCode());
-        companyModeldata= this.addCompanyModel(companyModeldata);
-
         //场站坐标信息
         List<StationCoordinate>  list=  stationBasic.getStationCoordinate();
         List<StationCoordinate>  listdate=new ArrayList<>();
@@ -115,8 +106,6 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
         stationBasic.setAreaName(companyModel.getCompanyName());
         stationBasic.setAreaCode(companyModel.getCompanyCode());
-        stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
-        stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
         //获取类型名称
         String typeName=this.queryByCode(CZLX,stationBasic.getStationType());
         stationBasic.setStationTypeName(typeName);
@@ -133,6 +122,17 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
             }
         }
         stationCoordinateServiceImpl.saveBatch(listdate);
+        //平台增加场站
+        CompanyModel companyModeldata=new CompanyModel();
+        companyModeldata.setCompanyName(stationBasic.getStationName());
+        companyModeldata.setCompanyType("company");
+        companyModeldata.setLevel("station");
+        companyModeldata.setParentId(Long.valueOf(stationBasic.getArea()));
+        companyModeldata.setCompanyCode(stationBasic.getStationCode());
+        companyModeldata= this.addCompanyModel(companyModeldata);
+        stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
+        stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
+        this.update(stationBasic);
     }
 
 
@@ -200,17 +200,6 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
 
     public void update(StationBasic  stationBasic)   {
 
-
-        //平台增加场站
-        CompanyModel companyModeldata=new CompanyModel();
-        companyModeldata.setCompanyName(stationBasic.getStationName());
-        companyModeldata.setCompanyType("company");
-        companyModeldata.setLevel("station");
-        companyModeldata.setParentId(Long.valueOf(stationBasic.getArea()));
-        companyModeldata.setCompanyCode(stationBasic.getStationCode());
-        companyModeldata= this.updateCompanyModel(companyModeldata,Long.valueOf(stationBasic.getPlatformStationId()));
-
-
         //场站坐标信息
         List<StationCoordinate>  list=  stationBasic.getStationCoordinate();
         List<StationCoordinate>  listdate=new ArrayList<>();
@@ -222,8 +211,6 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
         stationBasic.setAreaName(companyModel.getCompanyName());
         stationBasic.setAreaCode(companyModel.getCompanyCode());
-        stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
-        stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
 
         //获取类型名称
         String typeName=this.queryByCode(CZLX,stationBasic.getStationType());
@@ -237,6 +224,18 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
             listdate.add(stationCoordinate);
         }
         stationCoordinateServiceImpl.saveOrUpdateBatch(listdate);
+
+        //平台增加场站
+        CompanyModel companyModeldata=new CompanyModel();
+        companyModeldata.setCompanyName(stationBasic.getStationName());
+        companyModeldata.setCompanyType("company");
+        companyModeldata.setLevel("station");
+        companyModeldata.setParentId(Long.valueOf(stationBasic.getArea()));
+        companyModeldata.setCompanyCode(stationBasic.getStationCode());
+        companyModeldata= this.updateCompanyModel(companyModeldata,Long.valueOf(stationBasic.getPlatformStationId()));
+        stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
+        stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
+        stationBasicMapper.updateById(stationBasic);
     }
 
 
@@ -249,8 +248,9 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
             idscom.add(personAccount.getPlatformStationId());
         }
         //删除平台
+        int deleteResult = stationBasicMapper.deleteList(ids);
         this.deleteCompany(String.join(",",idscom));
-        return stationBasicMapper.deleteList(ids);
+        return deleteResult;
     }