From f2d4ff42371a71d3e1f2e4f160f9f0d982738f66 Mon Sep 17 00:00:00 2001 From: lg Date: Thu, 23 Oct 2025 15:04:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/XzdPurchaseContractInformationVo.java | 1 - .../org/dromara/xzd/service/impl/XzdCorrespondentListImp.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java index a2d23a68..106a02e4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java @@ -239,7 +239,6 @@ public class XzdPurchaseContractInformationVo implements Serializable { * 其他收入合同项目名称 */ @ExcelProperty(value = "其他收入合同项目名称") - @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "otherIncomeContractProject") private String otherIncomeContractProjectName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCorrespondentListImp.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCorrespondentListImp.java index 63325eb9..d6cc0978 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCorrespondentListImp.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCorrespondentListImp.java @@ -134,7 +134,7 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList { xzdCustomertypeInfoService.saveBatch(collect); for (XzdCustomertypeInfo customertypeInfo : collect) { - if (customertypeInfo.getPrimaryClass() == "1"){ + if (customertypeInfo.getPrimaryClass().equals("1")){ XzdCustomertype xzdCustomertype = iXzdCustomertypeService.getBaseMapper().selectById(customertypeInfo.getCustomertypeId()); if (xzdCustomertype != null){ customertype = xzdCustomertype.getCustomerType(); @@ -353,7 +353,7 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList { }).collect(Collectors.toList()); xzdCustomertypeInfoService.saveBatch(collect); for (XzdCustomertypeInfo customertypeInfo : collect) { - if (customertypeInfo.getPrimaryClass() == "1"){ + if (customertypeInfo.getPrimaryClass().equals("1")){ XzdCustomertype xzdCustomertype = iXzdCustomertypeService.getBaseMapper().selectById(customertypeInfo.getCustomertypeId()); if (xzdCustomertype != null){ customertype = xzdCustomertype.getCustomerType();