liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl

This commit is contained in:
Chengliang 2024-07-15 11:05:45 +08:00
parent 3bbe1ef027 f41d015019
commit 1d5f2a90be
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/engine/organization/thread/OrganizationSyncEc.java
View File

@ -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++) {

2
src/com/engine/organization/util/db/DBType.java
View File

@ -42,7 +42,7 @@ public enum DBType implements DBOperateAdapter {
@Override
public String concat(String some) {
return " ','+" + some + "+',' ";
return " ',cast('+" + some + "as varchar)+',' ";
}
@Override