diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java index 4835565..da6247a 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java @@ -516,7 +516,14 @@ public class CockpitUserDataCmd { Map recordMap = recordList.get(i); String operator_type = String.valueOf(recordMap.get("operator_type")); log.error("operator_type:"+operator_type); + String data_type = String.valueOf(recordMap.get("data_type")); + log.error("data_type:"+data_type); + String data_value = String.valueOf(recordMap.get("data_value")); + log.error("data_value:"+data_value); + String operator_type_name = ""; + String data_type_name = ""; + String data_value_name = ""; if ("trial".equals(operator_type)) { operator_type_name = "试用"; @@ -537,12 +544,7 @@ public class CockpitUserDataCmd { } else if ("custom".equals(operator_type)) { operator_type_name = "变更"; } - recordMap.put("operator_type_name", operator_type_name); - String data_type = String.valueOf(recordMap.get("data_type")); - log.error("data_type:"+data_type); - String data_type_name = ""; - String data_value = String.valueOf(recordMap.get("data_value")); - String data_value_name = ""; + if ("newDepartment".equals(data_type)) { data_type_name = "部门"; data_value_name = getDepartmentName(data_value,tenantKey,sourceType,groupId); @@ -553,6 +555,8 @@ public class CockpitUserDataCmd { data_type_name = "上级"; data_value_name = getSuperiorName(data_value,tenantKey,sourceType,groupId); } + + recordMap.put("operator_type_name", operator_type_name); recordMap.put("data_type_name", data_type_name); recordMap.put("data_value_name", data_value_name); } @@ -575,6 +579,11 @@ public class CockpitUserDataCmd { public String getDepartmentName(String departmentid,String tenantKey,String sourceType,String groupId){ // select name from Department where id=9080991104676336702 String deptname = "" ; + + log.error("getDepartmentName--departmentid:" + departmentid); + log.error("getDepartmentName--sourceType:" + sourceType); + log.error("getDepartmentName--groupId:" + groupId); + try{ String dataSql =" select name from eteams.department where id= ? tenant_key = ? "; log.error("getDepartmentName--dataSql:" + dataSql); @@ -603,10 +612,22 @@ public class CockpitUserDataCmd { return deptname; } - + /*** + * + * @param positionid + * @param tenantKey + * @param sourceType + * @param groupId + * @return + */ public String getPositionName(String positionid,String tenantKey,String sourceType,String groupId){ // select name from Department where id=9080991104676336702 String positionName = "" ; + + log.error("getPositionName--positionid:" + positionid); + log.error("getPositionName--sourceType:" + sourceType); + log.error("getPositionName--groupId:" + groupId); + try{ String dataSql =" select name from eteams.position where id= ? tenant_key = ? "; log.error("getPositionName--dataSql:" + dataSql); @@ -636,11 +657,22 @@ public class CockpitUserDataCmd { } - + /** + * + * @param employeeid + * @param tenantKey + * @param sourceType + * @param groupId + * @return + */ public String getSuperiorName(String employeeid,String tenantKey,String sourceType,String groupId){ // select name from Department where id=9080991104676336702 String employeeName = "" ; try{ + log.error("getSuperiorName--employeeid:" + employeeid); + log.error("getSuperiorName--sourceType:" + sourceType); + log.error("getSuperiorName--groupId:" + groupId); + String dataSql =" select name from eteams.employee where id= ? tenant_key = ? "; log.error("getSuperiorName--dataSql:" + dataSql); List sqlparam = new ArrayList();