From 99901f5cb98bd673af226d230702f795ea6f234a Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 15 Jul 2024 09:27:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D-=E8=8A=B1=E5=90=8D?= =?UTF-8?q?=E5=86=8C=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/util/db/DBType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/organization/util/db/DBType.java b/src/com/engine/organization/util/db/DBType.java index fae51acb..58a22467 100644 --- a/src/com/engine/organization/util/db/DBType.java +++ b/src/com/engine/organization/util/db/DBType.java @@ -42,7 +42,7 @@ public enum DBType implements DBOperateAdapter { @Override public String concat(String some) { - return " ','+" + some + "+',' "; + return " ',cast('+" + some + "as varchar)+',' "; } @Override From f41d015019612eca51e99117a9b659cc77c61680 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 15 Jul 2024 11:04:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D-=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/thread/OrganizationSyncEc.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/engine/organization/thread/OrganizationSyncEc.java b/src/com/engine/organization/thread/OrganizationSyncEc.java index a431a1a6..8d7df802 100644 --- a/src/com/engine/organization/thread/OrganizationSyncEc.java +++ b/src/com/engine/organization/thread/OrganizationSyncEc.java @@ -218,16 +218,18 @@ public class OrganizationSyncEc { map.put("id", ecDepartment); RecordSet rs = new RecordSet(); - // 先查拓展表 - rs.execute("select * from hrmdepartmentdefined where deptid = '" + ecDepartment + "'"); + + // 再查主表 + rs.execute("select * from hrmdepartment where id = '" + ecDepartment + "'"); int colcount = rs.getColCounts(); if (rs.next()) { for (int i = 1; i <= colcount; i++) { map.put(rs.getColumnName(i).toLowerCase(), Util.null2String(rs.getString(i))); } } - // 再查主表 - rs.execute("select * from hrmdepartment where id = '" + ecDepartment + "'"); + + // 先查拓展表 + rs.execute("select * from hrmdepartmentdefined where deptid = '" + ecDepartment + "'"); colcount = rs.getColCounts(); if (rs.next()) { for (int i = 1; i <= colcount; i++) {