From c782764503966061ef93a9870ebf6671d9ccd053 Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Fri, 29 Mar 2024 15:28:08 +0800 Subject: [PATCH] =?UTF-8?q?#E10-15#=20=E4=BA=BA=E5=91=98=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seconddev/jcldoor/cmd/UserInfoCmd.java | 52 ++++++++++++------- .../seconddev/jcldoor/cmd/WorkDataCmd.java | 47 +++++++++++------ 2 files changed, 65 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java b/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java index 7d0e01a..a9b4832 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java @@ -250,27 +250,43 @@ public class UserInfoCmd { public Map getUserType(SimpleEmployee simpleEmployee) { Map map = new HashMap<>(100); String type = "3"; - SimpleEmployee employee = UserContext.getCurrentUser(); - log.error("employee:"+employee.getEmployeeId()); - long formdata = employee.getFormdata(); + + try{ + String field69 = ""; + + SimpleEmployee employee = UserContext.getCurrentUser(); + 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"; - - String sql =" select field69,field69_obj from eteams.Hrmemployeedefined where form_data_id='"+formdata+"'" ; - - log.error("getSelfServiceData--sql:"+sql); - String field69 = ""; - Map result = databaseUtils.execute(sourceType, groupId, sql); - List> recordList = databaseUtils.getDataSourceList(result); - if(recordList.size()>0){ - // 销售 0，项目 1,技术 2，其它 3 - field69 = String.valueOf(recordList.get(0).get("field69")); + 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 from eteams.Hrmemployeedefined where form_data_id='"+formdata+"'" ; + log.error("getSelfServiceData--sql:"+sql); + + Map result = databaseUtils.execute(sourceType, groupId, sql); + List> 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); } - type = getfield69Type(field69); + map.put("type",type); return map; } diff --git a/src/main/java/com/weaver/seconddev/jcldoor/cmd/WorkDataCmd.java b/src/main/java/com/weaver/seconddev/jcldoor/cmd/WorkDataCmd.java index fef301b..996ce98 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/cmd/WorkDataCmd.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/cmd/WorkDataCmd.java @@ -902,27 +902,42 @@ public class WorkDataCmd { public Map getUserType(SimpleEmployee simpleEmployee) { Map map = new HashMap<>(100); String type = "3"; - SimpleEmployee employee = UserContext.getCurrentUser(); - log.error("employee:"+employee.getEmployeeId()); - long formdata = employee.getFormdata(); + 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); - String sourceType = "LOGIC"; + String pkey = "field69.groupId"; + //weaver-ebuilder-form-service + String groupId = jucailinPortalUtils.getUfPropData(pkey,tenant_key); + + 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 result = databaseUtils.execute(sourceType, groupId, sql); - List> recordList = databaseUtils.getDataSourceList(result); - if(recordList.size()>0){ - // 销售 0，项目 1,技术 2，其它 3 - field69 = String.valueOf(recordList.get(0).get("field69")); + log.error("getSelfServiceData--sql:"+sql); + String field69 = ""; + Map result = databaseUtils.execute(sourceType, groupId, sql); + List> 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); } - type = getfield69Type(field69); + map.put("type",type); return map; }