From 48474807813d5ba8632bf50c330a9bf754d5d4c9 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Wed, 30 Jul 2025 15:39:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(organization):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=B2=97=E4=BD=8D=E6=95=B0=E6=8D=AE=E8=BD=AC=E6=8D=A2=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 OrganizationInfoMapper.xml 中，将 is_canceled 字段的类型转换为 CHAR
- 在 OrganizationInfoServiceImpl.java 中，更新字段名称为 canceled
- 在 PositionData.java 中，将 isCanceled 字段改为 is_canceled
---
 .../organization/entity/po/PositionData.java          |  2 +-
 .../service/impl/OrganizationInfoServiceImpl.java     | 11 +++++------
 src/main/resources/mapper/OrganizationInfoMapper.xml  |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/weaver/seconddev/organization/entity/po/PositionData.java b/src/main/java/com/weaver/seconddev/organization/entity/po/PositionData.java
index 48d30d1..e1f6c7a 100644
--- a/src/main/java/com/weaver/seconddev/organization/entity/po/PositionData.java
+++ b/src/main/java/com/weaver/seconddev/organization/entity/po/PositionData.java
@@ -13,5 +13,5 @@ public class PositionData {
     private String code;
     private String name;
     private String oDeptId;
-    private String isCanceled;
+    private String is_canceled;
 }
diff --git a/src/main/java/com/weaver/seconddev/organization/service/impl/OrganizationInfoServiceImpl.java b/src/main/java/com/weaver/seconddev/organization/service/impl/OrganizationInfoServiceImpl.java
index f461a79..aa5b51b 100644
--- a/src/main/java/com/weaver/seconddev/organization/service/impl/OrganizationInfoServiceImpl.java
+++ b/src/main/java/com/weaver/seconddev/organization/service/impl/OrganizationInfoServiceImpl.java
@@ -152,12 +152,11 @@ public class OrganizationInfoServiceImpl implements OrganizationInfoService {
 
         for (Map<String, Object> map : positionList) {
             PositionData positionData = new PositionData();
-            positionData.setOId(Convert.toStr(map.get("oid"),""));
-            positionData.setCode(Convert.toStr(map.get("positionCode"),""));
-            positionData.setName(Convert.toStr(map.get("positionName"),""));
-            positionData.setODeptId(Convert.toStr(map.get("odeptid"),""));
-            positionData.setIsCanceled(Convert.toStr(map.get("is_canceled"),""));
-
+            positionData.setOId(Convert.toStr(map.get("oid"), ""));
+            positionData.setCode(Convert.toStr(map.get("positionCode"), ""));
+            positionData.setName(Convert.toStr(map.get("positionName"), ""));
+            positionData.setODeptId(Convert.toStr(map.get("odeptid"), ""));
+            positionData.setIs_canceled(Convert.toStr(map.get("canceled"), "0"));
             orgList.add(positionData);
         }
 
diff --git a/src/main/resources/mapper/OrganizationInfoMapper.xml b/src/main/resources/mapper/OrganizationInfoMapper.xml
index 48594a6..86aa7ec 100644
--- a/src/main/resources/mapper/OrganizationInfoMapper.xml
+++ b/src/main/resources/mapper/OrganizationInfoMapper.xml
@@ -81,7 +81,7 @@
     </select>
 
     <select id="getPositionList" resultType="java.util.Map">
-        select t1.ID as positionId, t1.code as positionCode, t1.name as positionName, t2.odeptid, t1.is_canceled
+        select t1.ID as positionId, t1.code as positionCode, t1.name as positionName, t2.odeptid, CAST(t1.is_canceled AS CHAR) as canceled
         from ${eteams}.position t1
         inner join ${eteams}.${table_job_cus} t2 on t1.formdata = t2.ID
         where t1.tenant_key = #{tenantKey} and t1.delete_type = 0