1、海康人脸同步调整

2、数据面板查询调整

src/main/java/com/xjrsoft/module/databoard/controller/DatadetailController.java

@@ -296,10 +296,12 @@ public class DatadetailController {
     @SaCheckPermission("datadetail:detail")
     @XjrLog(value = "教职工详情数据统计", saveResponseData = true)
     public RT<TeacherStatisticsDetailVo> teahcerStatistics(@Valid StatisticsDetailDto dto) throws ParseException {
-        String sql = "SELECT IFNULL(t2.name,'未填写') AS item ,ifnull(COUNT(*), 0) AS a_count FROM base_teacher_education t1" +
-                " left join base_teacher t3 on t1.user_id = t3.user_id" +
-                " LEFT JOIN xjr_dictionary_detail t2 ON t1.education  = t2.code" +
-                " WHERE t1.delete_mark = 0 and t3.job_state in ('ZZZT10004','ZZZT10009','JOB_WCPX','JOB_DDSX')" +
+        String sql = "SELECT IFNULL(t2.name,'未填写') AS item ,IFNULL(COUNT(*), 0) AS a_count FROM xjr_user t1" +
+                " INNER JOIN base_teacher_education t4 ON  t1.id = t4.user_id " +
+                " LEFT JOIN base_teacher t3 ON t1.id = t3.user_id" +
+                " LEFT JOIN xjr_dictionary_detail t2 ON t4.education  = t2.code" +
+                " WHERE t1.delete_mark = 0 AND t3.job_state IN ('ZZZT10004','ZZZT10009','JOB_WCPX','JOB_DDSX')" +
+                " AND t4.delete_mark = 0" +
                 " GROUP BY t2.name";
         List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql);
         TeacherStatisticsDetailVo result = new TeacherStatisticsDetailVo();

src/main/java/com/xjrsoft/module/job/StudentFaceTask.java

@@ -60,7 +60,7 @@ public class StudentFaceTask {
             JsonArray array = new JsonArray();
             String hikvisionId = hikvisionDataMapper.getStudentHikvisionId(dataObj.getUserId());
             if(hikvisionId == null){
-                continue;
+                hikvisionId = dataObj.getUserId().toString();
             }
             array.add(hikvisionId);
             paramsJson.add("paramValue", array);

src/test/java/com/xjrsoft/module/liteflow/node/ImportStudentFaceNodeTest.java

@@ -74,7 +74,7 @@ class ImportStudentFaceNodeTest {
             JsonArray array = new JsonArray();
             String hikvisionId = hikvisionDataMapper.getStudentHikvisionId(dataObj.getUserId());
             if(hikvisionId == null){
-                continue;
+                hikvisionId = dataObj.getUserId().toString();
             }
             array.add(hikvisionId);
             paramsJson.add("paramValue", array);