#E10-15# 人员类型接口优化

src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java

@@ -250,27 +250,43 @@ public class UserInfoCmd {
     public Map<String, Object> getUserType(SimpleEmployee simpleEmployee) {
         Map<String, Object> map = new HashMap<>(100);
         String type = "3";
+
+
+        try{
+            String field69 = "";
+
             SimpleEmployee employee = UserContext.getCurrentUser();
-        log.error("employee:"+employee.getEmployeeId());
+            log.error("getUserType-employee:"+employee.getEmployeeId());
 
             long formdata = employee.getFormdata();
+            log.error("getUserType--formdata:"+formdata);
+
 //        String groupId = "weaver-ebuilder-form-service";
             String pkey = "field69.groupId";
             //weaver-ebuilder-form-service
             String groupId =  jucailinPortalUtils.getUfPropData(pkey,tenant_key);
-        String sourceType = "LOGIC";
+            log.error("groupId:"+groupId);
 
-        String sql =" select field69,field69_obj from eteams.Hrmemployeedefined where form_data_id='"+formdata+"'" ;
+            String sourceType = "LOGIC";
 
+            String sql =" select field69 from eteams.Hrmemployeedefined where form_data_id='"+formdata+"'" ;
             log.error("getSelfServiceData--sql:"+sql);
-        String field69 = "";
+
             Map<String, Object> result = databaseUtils.execute(sourceType, groupId, sql);
             List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
             if(recordList.size()>0){
                 // 销售 0，项目 1,技术 2，其它 3
                 field69 = String.valueOf(recordList.get(0).get("field69"));
             }
+            log.error("field69:"+field69);
+            if(StringUtils.isNotBlank(field69)){
                 type = getfield69Type(field69);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error("getUserType-e:"+e);
+        }
+
         map.put("type",type);
         return map;
     }

src/main/java/com/weaver/seconddev/jcldoor/cmd/WorkDataCmd.java

@@ -902,17 +902,22 @@ public class WorkDataCmd {
     public Map<String, Object> getUserType(SimpleEmployee simpleEmployee) {
         Map<String, Object> map = new HashMap<>(100);
         String type = "3";
+
+        try{
             SimpleEmployee employee = UserContext.getCurrentUser();
             log.error("employee:"+employee.getEmployeeId());
-
             long formdata = employee.getFormdata();
+            log.error("formdata:"+formdata);
 //        String groupId = "weaver-ebuilder-form-service";
             String pkey = "field69.groupId";
             //weaver-ebuilder-form-service
             String groupId =  jucailinPortalUtils.getUfPropData(pkey,tenant_key);
+
+            log.error("groupId:"+groupId);
+
             String sourceType = "LOGIC";
 
-        String sql =" select field69,field69_obj from eteams.Hrmemployeedefined where form_data_id='"+formdata+"'" ;
+            String sql =" select field69 from eteams.Hrmemployeedefined where form_data_id='"+formdata+"'" ;
 
             log.error("getSelfServiceData--sql:"+sql);
             String field69 = "";
@@ -922,7 +927,17 @@ public class WorkDataCmd {
                 // 销售 0，项目 1,技术 2，其它 3
                 field69 = String.valueOf(recordList.get(0).get("field69"));
             }
+
+            log.error("field69:"+field69);
+
+            if(StringUtils.isNotBlank(field69)){
                 type = getfield69Type(field69);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error("getUserType-e:"+e);
+        }
+
         map.put("type",type);
         return map;
     }