From 0365e27476f039a052a4bb2a0ea8756c47fb9898 Mon Sep 17 00:00:00 2001
From: shilei <798989044@qq.com>
Date: Thu, 30 May 2024 12:01:16 +0800
Subject: [PATCH] =?UTF-8?q?#E10-40#=20=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cockpit/cmd/CockpitUserDataCmd.java       | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

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 47445f7..8fd761e 100644
--- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java
+++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java
@@ -37,16 +37,24 @@ public class CockpitUserDataCmd {
         String sourceType = "LOGIC";
         try {
             String employeeId = String.valueOf(employee.getEmployeeId());
-
+            log.error("employeeId:"+employeeId);
             String username = employee.getName();
+            log.error("username:"+username);
+
             String deptnme = employee.getDepartment().getName();
+            log.error("deptnme:"+deptnme);
             String subcompanynme = employee.getDepartment().getParent().getName();
+            log.error("subcompanynme:"+subcompanynme);
 
             String positionname = employee.getPosition().getName();
+            log.error("positionname:"+positionname);
             String gradename = employee.getGrade().getName();
+            log.error("gradename:"+gradename);
 
             String personnelstatusname = "" ;
             String personnelstatus = employee.getPersonnelStatus();
+            log.error("personnelstatus:"+personnelstatus);
+
             if("1".equals(personnelstatus)){
                 personnelstatusname = "试用员工";
             }else if("2".equals(personnelstatus)){
@@ -67,25 +75,31 @@ public class CockpitUserDataCmd {
                 personnelstatusname = "无效员工";
             }
 
+            log.error("personnelstatusname:"+personnelstatusname);
+
             String userimageurl = "/profile/" + employeeId + "/personal";
 
             long formdata = employee.getFormdata();
+            log.error("formdata:"+formdata);
+
             String pkey = "field69.groupId";
             String groupId =  jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
             log.error("groupId:"+groupId);
 
             String jobcallname = "";
             long jobcallid = employee.getJobCall();
+            log.error("jobcallid:"+jobcallid);
+
             if(StringUtils.isNotBlank(jobcallid+"")){
-                String sql =" select data_name from hrm_jobcall " +
+                String sql =" select data_name from eteams.hrm_jobcall " +
                             " where id = ? "+
                             " and delete_type = 0\n" +
                             " and tenant_key = ? \n" ;
-
+                log.error("sql:"+sql);
                 List<SqlParamEntity> sqlparam = new ArrayList<SqlParamEntity>();
                 SqlParamEntity sqlParamEntity = new SqlParamEntity();
                 sqlParamEntity.setParamType(SqlParamType.LONG);
-                sqlParamEntity.setValue(employeeId+"");
+                sqlParamEntity.setValue(jobcallid+"");
                 sqlparam.add(sqlParamEntity);
 
                 sqlParamEntity = new SqlParamEntity();
@@ -101,7 +115,7 @@ public class CockpitUserDataCmd {
             }
 
             String field69 = "";
-            if(StringUtils.isNotBlank(formdata+"s")){
+            if(StringUtils.isNotBlank(formdata+"")){
                 String sql =" select field69 from eteams.Hrmemployeedefined where form_data_id = ?" ;
                 log.error("getSelfServiceData--sql:"+sql);
 
@@ -129,6 +143,7 @@ public class CockpitUserDataCmd {
                 }
             }
 
+            log.error("field69:"+field69);
             recordMap.put("employeeId",employeeId);
             recordMap.put("username",username);
             recordMap.put("deptmentnnme",subcompanynme+"-"+deptnme);