统一根据区域公司筛选的方法

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/ShipInfoDaoImpl.java

@@ -62,7 +62,7 @@ public class ShipInfoDaoImpl extends AbstractBaseDao implements ShipInfoDao, Shi
         KClass bean = Amino.getStaticMetadataContext().getBean(ENTITY, KClass.class);
         DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
         detachedCriteria.add(Restrictions.eq("del", false));
-        addRegionalCompanyFilter(detachedCriteria);
+        dinasTypeDao.addRegionalCompanyFilter(detachedCriteria);
         if(StringUtils.isNotBlank(shipName)){
             detachedCriteria.add(Restrictions.like("shipName", "%"+shipName+"%"));
 
@@ -78,13 +78,6 @@ public class ShipInfoDaoImpl extends AbstractBaseDao implements ShipInfoDao, Shi
         return page;
     }
 
-    private void addRegionalCompanyFilter(DetachedCriteria detachedCriteria) {
-        KObject currentLoginRegionalCompany = dinasTypeDao.getCurrentLoginRegionalCompany();
-        if(currentLoginRegionalCompany !=null&& currentLoginRegionalCompany.getString("type").equals(OrganizationTypeEnum.REGIONAL_COMPANY.name())) {
-            detachedCriteria.add(Restrictions.eq("regionalCompany.id", currentLoginRegionalCompany.getUuid("id")));
-        }
-    }
-
 
     @Override
     public List<KObject> getByName(String name, UUID id) {