diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index a9a164ea..3df8c227 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -34,6 +34,7 @@ import com.jero.member.service.IPayMemberProjectSubitemService; import com.jero.member.service.ITbMemberProjectSubitemService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; +import com.jero.pack.entity.PayPackCompany; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.service.IPayCommonProjectService; @@ -1057,4 +1058,15 @@ public class PayCompanyManagementController extends JeroController judgeCompanyIsPackaged(@RequestParam(name="companyId") String companyId){ + PayCompanyManagement companyManagement = payCompanyManagementService.getById(companyId); + String packageEnterprise = companyManagement.getPackageEnterprise(); + return Result.OK(Objects.equals(packageEnterprise,"true")) ; + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java index 52de735d..2ae3c47e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java @@ -292,17 +292,7 @@ public class PayPackCompanyController extends JeroController judgeCompanyIsPackaged(@RequestParam(name="companyId") String companyId){ - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayPackCompany::getCompanyId,companyId); - int count = payPackCompanyService.count(wrapper); - return Result.OK(count > 0) ; - } + /** * 导出excel