From 1977ab66a11ea396e2445f7183207bc39d8f59ee Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 13 Mar 2024 15:46:27 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=98=AF=E6=89=93=E5=8C=85=E4=BC=81=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayCompanyManagementController.java   | 12 ++++++++++++
 .../pack/controller/PayPackCompanyController.java    | 12 +-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

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<PayCompanyMan
 		payCompanyManagementService.updateById(payCompanyManagement);
 		return Result.OK("成功!");
 	}
+
+	/**
+	 * 判断当前企业是否是打包企业
+	 */
+	@ApiOperation(value="判断当前企业是否是打包企业")
+	@GetMapping(value = "/judgeCompanyIsPackaged")
+	public Result<Boolean> 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<PayPackCompany, IPa
 		return Result.OK(payPackCompany);
 	}
 
-	 /**
-	  * 判断当前企业是否是打包企业
-	  */
-	 @ApiOperation(value="判断当前企业是否是打包企业")
-	 @GetMapping(value = "/judgeCompanyIsPackaged")
-	 public Result<Boolean> judgeCompanyIsPackaged(@RequestParam(name="companyId") String companyId){
-		 LambdaQueryWrapper<PayPackCompany> wrapper = new LambdaQueryWrapper<>();
-		 wrapper.eq(PayPackCompany::getCompanyId,companyId);
-		 int count = payPackCompanyService.count(wrapper);
-		 return Result.OK(count > 0) ;
-	 }
+
 
     /**
     * 导出excel