diff --git a/out/artifacts/hrm_attendance/hrm-attendance.jar b/out/artifacts/hrm_attendance/hrm-attendance.jar
index 180a3ff..07af875 100644
Binary files a/out/artifacts/hrm_attendance/hrm-attendance.jar and b/out/artifacts/hrm_attendance/hrm-attendance.jar differ
diff --git a/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java b/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java
index 91a3ec3..ff5e83e 100644
--- a/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java
+++ b/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java
@@ -112,7 +112,6 @@ public class AttendanceAnalysisWrapper extends Service {
         //前一天打卡数据
         log.info("getClockTimeParam : [{}]",getClockTimeParam);
         List<Map<String, Object>> clockInTimeList = utilService.getClockInTime(getClockTimeParam);
-
         analysis(userId,analysisDate,clockInTimeList,schedulingResultsMap.get(analysisDate),attendanceItems,schedulingMapBydate.get(analysisDate));
 
     }
diff --git a/src/com/engine/attendance/component/persongroup/cmd/GetDatatableCmd.java b/src/com/engine/attendance/component/persongroup/cmd/GetDatatableCmd.java
index e365636..346c601 100644
--- a/src/com/engine/attendance/component/persongroup/cmd/GetDatatableCmd.java
+++ b/src/com/engine/attendance/component/persongroup/cmd/GetDatatableCmd.java
@@ -71,8 +71,32 @@ public class GetDatatableCmd extends AbstractCommonCommand<Map<String,Object>> {
         }
         int startindex = (current-1)*pageSize;
         String dbType = rs.getDBType();
-        if ("oracle".equals(dbType)){
 
+        if ("oracle".equals(dbType) || "dm".equals(dbType) || "jc".equals(dbType) || "st".equals(dbType)){
+            sql = "select row_number() over(order by id asc) rownum ,id from "+tableName +" where pbtj=0 ";
+            sql = sql+conditions;
+            sql = "select top 1 a.id from ( "+sql+" ) a where a.rownum>"+startindex;
+
+            String queryDatatablesql = "select top "+pageSize+" a.id as 'key',b.lastname,a.* from "+tableName +" a left join hrmresource b on a.pbdxry=b.id where a.id>=("+sql+") "+conditions;
+
+            log.info("queryDatatablesql : {}",queryDatatablesql);
+            param.addAll(param);
+            log.info("param : {}",param);
+            List<Map<String,Object>> dataTable = DbTools.getSqlToList(queryDatatablesql,param.toArray());
+            resultMap.put("data",dataTable);
+
+        }else if ("sqlserver".equals(dbType)){
+            sql = "select row_number() over(order by id asc) rownum ,id from "+tableName +" where pbtj=0 ";
+            sql = sql+conditions;
+            sql = "select top 1 a.id from ( "+sql+" ) a where a.rownum>"+startindex;
+
+            String queryDatatablesql = "select top "+pageSize+" a.id as 'key',b.lastname,a.* from "+tableName +" a left join hrmresource b on a.pbdxry=b.id where a.id>=("+sql+") "+conditions;
+
+            log.info("queryDatatablesql : {}",queryDatatablesql);
+            param.addAll(param);
+            log.info("param : {}",param);
+            List<Map<String,Object>> dataTable = DbTools.getSqlToList(queryDatatablesql,param.toArray());
+            resultMap.put("data",dataTable);
         }else {
             sql = sql + conditions +" limit "+startindex+",1";
             String queryDatatablesql = "select a.id as `key`,b.lastname,a.* from "+tableName +" a left join hrmresource b on a.pbdxry=b.id where a.id>=("+sql+") "+conditions+" limit "+pageSize;
diff --git a/target/classes/com/engine/attendance/component/persongroup/cmd/GetDatatableCmd.class b/target/classes/com/engine/attendance/component/persongroup/cmd/GetDatatableCmd.class
index 880d4e2..ecb8b55 100644
Binary files a/target/classes/com/engine/attendance/component/persongroup/cmd/GetDatatableCmd.class and b/target/classes/com/engine/attendance/component/persongroup/cmd/GetDatatableCmd.class differ
diff --git a/target/classes/com/engine/attendance/component/persongroup/job/scheduling/SchedulingJob.class b/target/classes/com/engine/attendance/component/persongroup/job/scheduling/SchedulingJob.class
index 8f3b87f..fe5f6f4 100644
Binary files a/target/classes/com/engine/attendance/component/persongroup/job/scheduling/SchedulingJob.class and b/target/classes/com/engine/attendance/component/persongroup/job/scheduling/SchedulingJob.class differ
diff --git a/target/classes/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.class b/target/classes/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.class
index d90d0db..c9432bb 100644
Binary files a/target/classes/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.class and b/target/classes/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.class differ
diff --git a/target/classes/com/engine/common/util/Utils.class b/target/classes/com/engine/common/util/Utils.class
index 78c1658..19efde8 100644
Binary files a/target/classes/com/engine/common/util/Utils.class and b/target/classes/com/engine/common/util/Utils.class differ