diff --git a/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java b/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java index ed62d5a..9719d6d 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java @@ -355,7 +355,8 @@ public class SelfServiceInfoCmd { recordMap.put("code","200"); recordMap.put("type","1"); }else{ - int count = initCustomServiceData(groupId,sourceType,field_id,employeeId,uf_zzfwrktaby_qy,uf_zzfwrkpz_qy,objId); + log.error("uf_zzfwrkpz is null "); + int count = initCustomServiceData(groupId,sourceType,field_id,employeeId,uf_zzfwrktaby_qy,uf_zzfwrkpz_qy); if(count > 0){ recordMap.put("code","-100"); }else{ @@ -378,7 +379,7 @@ public class SelfServiceInfoCmd { * @param sourceType * @return */ - public int initCustomServiceData(String groupId,String sourceType,String field_id,String employeeId,String uf_zzfwrktaby_qy,String uf_zzfwrkpz_qy,String objId){ + public int initCustomServiceData(String groupId,String sourceType,String field_id,String employeeId,String uf_zzfwrktaby_qy,String uf_zzfwrkpz_qy){ int errcount = 0; try{ List> recordList = getFieldOptionList(sourceType,groupId,field_id); @@ -670,36 +671,32 @@ public class SelfServiceInfoCmd { Map recordMap = new HashMap(); - String pkey = "uf_zzfwrktaby.qy.value"; - String uf_zzfwrktaby_qy = jucailinPortalUtils.getUfPropData(pkey,tenant_key); - - pkey = "uf_zzfwrkpz.qy.value"; - String uf_zzfwrkpz_qy = jucailinPortalUtils.getUfPropData(pkey,tenant_key); - String code1 = "" ; String code2 = "" ; try{ - String sql1 =" update uf_zzfwrktaby set qy="+uf_zzfwrktaby_qy+",updater ="+employeeId+",is_flow=0,data_status=1 where ry ="+employeeId+" and tenant_key='"+tenant_key+"' and delete_type = 0 "; - Map result1 = databaseUtils.execute(sourceType, groupId, sql1); - Iterator> iterator1 = result1.entrySet().iterator(); - while (iterator1.hasNext()){ - Map.Entry next = iterator1.next(); - log.error("insertCustomServiceData--key="+next.getKey()+" value="+String.valueOf(next.getValue())); - } - if(result1.containsKey("code")){ - code1 = String.valueOf(result1.get("code")); - } + if(StringUtils.isNotBlank(employeeId)){ + String sql1 =" update uf_zzfwrktaby set delete_type = 1,is_delete=1 where ry ="+employeeId+" and tenant_key='"+tenant_key+"' "; + Map result1 = databaseUtils.execute(sourceType, groupId, sql1); + Iterator> iterator1 = result1.entrySet().iterator(); + while (iterator1.hasNext()){ + Map.Entry next = iterator1.next(); + log.error("insertCustomServiceData--key="+next.getKey()+" value="+String.valueOf(next.getValue())); + } + if(result1.containsKey("code")){ + code1 = String.valueOf(result1.get("code")); + } - String sql2 =" update uf_zzfwrkpz set qy="+uf_zzfwrkpz_qy+",updater ="+employeeId+",is_flow=0,data_status=1 where ry ="+employeeId+" and tenant_key='"+tenant_key+"' and delete_type = 0 "; - Map result2 = databaseUtils.execute(sourceType, groupId, sql2); - Iterator> iterator2 = result2.entrySet().iterator(); - while (iterator2.hasNext()){ - Map.Entry next = iterator2.next(); - log.error("insertCustomServiceData--key="+next.getKey()+" value="+String.valueOf(next.getValue())); - } - if(result2.containsKey("code")){ - code2 = String.valueOf(result2.get("code")); + String sql2 =" update uf_zzfwrkpz set delete_type = 1,is_delete=1 where ry ="+employeeId+" and tenant_key='"+tenant_key+"'"; + Map result2 = databaseUtils.execute(sourceType, groupId, sql2); + Iterator> iterator2 = result2.entrySet().iterator(); + while (iterator2.hasNext()){ + Map.Entry next = iterator2.next(); + log.error("insertCustomServiceData--key="+next.getKey()+" value="+String.valueOf(next.getValue())); + } + if(result2.containsKey("code")){ + code2 = String.valueOf(result2.get("code")); + } } }catch (Exception e){ diff --git a/src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java b/src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java index 168b49b..181567d 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java @@ -660,18 +660,14 @@ public class JucailinPortalController { @GetMapping("/updateSelfServiceData") @WeaPermission(publicPermission = true) public WeaResult updateSelfServiceData(HttpServletRequest request){ - log.error("initSelfServiceData"); + log.error("updateSelfServiceData"); Map dataMap = new HashMap(); - try{ - SimpleEmployee employee = UserContext.getCurrentUser(); - String employeeId = request.getParameter("employeeId"); if(StringUtils.isBlank(employeeId)){ - employeeId = String.valueOf(employee.getEmployeeId()); + employeeId = String.valueOf(UserContext.getCurrentEmployeeId()); } log.error("employeeId:"+employeeId); - dataMap = jucailinPortalService.updateSelfServiceData(employeeId); }catch (Exception e){ log.error("addSelfServiceCount-Exception:"+e.getMessage());