#E10-43# 优化人员信息接口

src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java

@@ -259,7 +259,7 @@ public class CockpitUserDataCmd {
             List<Map<String, Object>> changeList = new ArrayList<Map<String, Object>>();
             if (StringUtils.isNotBlank(hiredate)) {
                 Map<String, Object> hireMap = new HashMap<String, Object>();
-                hireMap.put("changedate", hiredate);
+                hireMap.put("change_date", hiredate);
                 hireMap.put("operator_type", "entry");
                 hireMap.put("operator_type_name", "入职");
                 hireMap.put("data_type", "");
@@ -276,13 +276,15 @@ public class CockpitUserDataCmd {
             for (int i = 0; i < changeList.size()-1; i++) {
                 Map<String,Object> currentMap = changeList.get(i);
                 Map<String,Object> nextMap = changeList.get(i+1);
-                String current_changedate = String.valueOf(currentMap.get("changedate"));
+                String current_changedate = String.valueOf(currentMap.get("change_date"));
-                String next_changedate = String.valueOf(nextMap.get("changedate"));
+                String next_changedate = String.valueOf(nextMap.get("change_date"));
                 log.error("current_changedate:"+current_changedate);
                 log.error("next_changedate:"+next_changedate);
 
                 String diffdate = "";
-                if(StringUtils.isNotBlank(current_changedate) && StringUtils.isNotBlank(next_changedate)){
+                if(StringUtils.isNotBlank(current_changedate) && StringUtils.isNotBlank(next_changedate)
+                        && !"null".equals(current_changedate) && !"null".equals(next_changedate)
+                ){
                     try{
                         LocalDate current_date = LocalDate.parse(current_changedate);
                         LocalDate next_date = LocalDate.parse(next_changedate);
@@ -432,7 +434,7 @@ public class CockpitUserDataCmd {
             }
             log.error("hiredate:"+hiredate);
             if (StringUtils.isNotBlank(hiredate)) {
-                map.put("changedate", hiredate);
+                map.put("change_date", hiredate);
                 map.put("operator_type", "entry");
                 map.put("operator_type_name", "入职");
                 map.put("data_type", "");
@@ -476,7 +478,7 @@ public class CockpitUserDataCmd {
 //            }
 //
 //            if (StringUtils.isNotBlank(hiredate)) {
-//                map.put("changedate", hiredate);
+//                map.put("change_date", hiredate);
 //                map.put("operator_type", "entry");
 //                map.put("operator_type_name", "入职");
 //                map.put("data_type", "");
@@ -707,7 +709,7 @@ public class CockpitUserDataCmd {
             log.error("getSuperiorName--sourceType:" + sourceType);
             log.error("getSuperiorName--groupId:" + groupId);
 
-            String dataSql =" select name from eteams.employee where id= ? and tenant_key = ? ";
+            String dataSql =" select username from eteams.employee where id= ? and tenant_key = ? ";
             log.error("getSuperiorName--dataSql:" + dataSql);
             List<SqlParamEntity> sqlparam = new ArrayList<SqlParamEntity>();
             SqlParamEntity sqlParamEntity = new SqlParamEntity();
@@ -723,7 +725,7 @@ public class CockpitUserDataCmd {
             List<Map<String, Object>> recordList = databaseUtils.getDataSourceList(result);
             log.error("getSuperiorName--recordList:" + recordList.size());
             if(!recordList.isEmpty() && recordList.size()>0){
-                employeeName = String.valueOf(recordList.get(0).get("name"));
+                employeeName = String.valueOf(recordList.get(0).get("username"));
             }
             log.error("getSuperiorName--employeeName:" + employeeName);
         }catch (Exception e){