更新0711

dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/CompanyService.java

@@ -78,15 +78,4 @@ public interface CompanyService extends IService<Company> {
      **/
     CompanyToServerVO getCompanyServerById(String id);
     Company getCompanyByTenantIdAndSystemCode(String tenantId, String systemCode);
-
-
-
-    /**
-     * 通过租户ID和系统编码查询企业信息
-     *
-     * @param tenantId 租户ID
-     * @param systemCode 系统编码
-     * @return
-     */
-    CompanyRespVO getCompanyByTenantIdAndSystemCode(Long tenantId, String systemCode);
 }

dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/impl/CompanyServiceImpl.java

@@ -231,19 +231,4 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         List<Company> list = this.list(queryWrapper);
         return list.isEmpty() ? null : list.get(0);
     }
-
-    /**
-     * 通过租户ID和系统编码查询企业信息
-     *
-     * @param tenantId   租户ID
-     * @param systemCode 系统编码
-     * @return
-     */
-    @Override
-    public CompanyRespVO getCompanyByTenantIdAndSystemCode(Long tenantId, String systemCode) {
-        return BeanUtil.copyProperties(baseMapper.selectOne(Wrappers.<Company>lambdaQuery()
-                .eq(Company::getTenantId, tenantId)
-                .like(ObjectUtil.isNotEmpty(systemCode), Company::getServiceCodes, systemCode)),
-                CompanyRespVO.class);
-    }
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionOrderServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.company.entity.Company;
 import cn.iocoder.yudao.module.company.service.CompanyService;
 import cn.iocoder.yudao.module.company.vo.CompanyRespVO;
 import cn.iocoder.yudao.module.partner.entity.PartnerWorker;
@@ -68,7 +69,7 @@ public class AppInspectionOrderServiceImpl extends ServiceImpl<OrderInfoMapper,
             return null;
         }
         // 通过订单租户id 查询商家信息
-        CompanyRespVO partners = companyService.getCompanyByTenantIdAndSystemCode(orderInfo.getTenantId(), "jiance");
+        Company partners = companyService.getCompanyByTenantIdAndSystemCode(orderInfo.getTenantId().toString(), "jiance");
         OrderAppDetail  orderDetail =new OrderAppDetail();
         orderDetail.setOrderStatus(orderInfo.getOrderStatus());
         orderDetail.setGoodsId(orderInfo.getGoodsId());