ZhangWenQiang 6 лет назад
Родитель
Сommit
56422b17f2

+ 3 - 1
happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgplatform/service/impl/HlgPlatformSubcontractorServiceImpl.java

@@ -55,13 +55,15 @@ public class HlgPlatformSubcontractorServiceImpl extends ServiceImpl<HlgPlatform
     @Override
     public Result<HlgPlatformSubcontractor> deletePlatformSubcontractor(HlgPlatformSubcontractor hlgPlatformSubcontractor) {
         Result<HlgPlatformSubcontractor> result = new Result<HlgPlatformSubcontractor>();
+        hlgPlatformSubcontractor = getById(hlgPlatformSubcontractor.getId());
+        int subcontractorId = hlgPlatformSubcontractor.getSubcontractorId();
         /**
          * 查看该平台的企业是否有配置该服务商
          */
         //1、查出所有该平台下企业配置的服务商
         List<HlgCompanySubcontractor> hlgCompanySubcontractorList = baseMapper.findCompanyList(hlgPlatformSubcontractor);
         //2、查出是否有该服务商
-        List<HlgCompanySubcontractor> hlgCompanySubcontractorList1 = hlgCompanySubcontractorList.stream().filter(hlgCompanySubcontractor -> hlgPlatformSubcontractor.getSubcontractorId().equals(hlgCompanySubcontractor.getSubcontractorId())).collect(Collectors.toList());
+        List<HlgCompanySubcontractor> hlgCompanySubcontractorList1 = hlgCompanySubcontractorList.stream().filter(hlgCompanySubcontractor -> subcontractorId == hlgCompanySubcontractor.getSubcontractorId()).collect(Collectors.toList());
         if (hlgCompanySubcontractorList1.size() > 0) {
             result.error500("该配置已存在业务数据,无法删除");
             return result;