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

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

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