From eb93dd383c349a4200cfe2a39dfa9eba59709d4a Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 10 Apr 2024 16:51:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=EF=BC=8C=E5=87=BA=E5=8B=A4?= =?UTF-8?q?=E6=B4=A5=E8=B4=B4=E6=95=B0=E6=8D=AE=E7=94=9F=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=B8=AD=E4=BA=BA=E5=91=98=E8=8C=83=E5=9B=B4ids?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/common/util/CommonUtil.java | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/com/engine/common/util/CommonUtil.java b/src/com/engine/common/util/CommonUtil.java index 68caccc..db94596 100644 --- a/src/com/engine/common/util/CommonUtil.java +++ b/src/com/engine/common/util/CommonUtil.java @@ -248,15 +248,15 @@ public class CommonUtil { List empIdList = new ArrayList<>(); String sql = "select dxlx,aqjb,dx from uf_jcl_syzz where modeid=? and dataid = ?"; //适用组织所有值集合 - List> organzationList = DbTools.getSqlToList(sql,modeId, dataId); + List> organizationList = DbTools.getSqlToListKeySmallLetter(sql,modeId, dataId); //分组 List> empIdInfos = new ArrayList<>(); List> empGroupIdInfos = new ArrayList<>(); List> depIdInfos = new ArrayList<>(); List> subCompanyIdInfos = new ArrayList<>(); - for (Map organzation:organzationList){ - String id = Util.null2String(organzation.get("dx")).split("-")[0]; - String securityLevel = Util.null2String(organzation.get("aqjb")); + for (Map organization : organizationList){ + String id = Util.null2String(organization.get("dx")).split("-")[0]; + String securityLevel = Util.null2String(organization.get("aqjb")); String[] securityLevelArr = securityLevel.split("-"); String minSecurityLevel = securityLevel.substring(0, 1).equals("-") ? "" : securityLevelArr[0]; String maxSecurityLevel = ""; @@ -265,25 +265,25 @@ public class CommonUtil { } else if (securityLevelArr.length == 2) { maxSecurityLevel = securityLevelArr[1]; } - if (ApplicableOrganizationEnum.PERSONNEL.getKey().equals(organzation.get("dxlx"))){ + if (ApplicableOrganizationEnum.PERSONNEL.getKey().equals(organization.get("dxlx"))){ Map infoItem = new HashMap<>(); infoItem.put("id", id); infoItem.put("minSecurityLevel", minSecurityLevel); infoItem.put("maxSecurityLevel", maxSecurityLevel); empIdInfos.add(infoItem); - }else if (ApplicableOrganizationEnum.PERSONNEL_GROUP.getKey().equals(organzation.get("dxlx"))){ + }else if (ApplicableOrganizationEnum.PERSONNEL_GROUP.getKey().equals(organization.get("dxlx"))){ Map infoItem = new HashMap<>(); infoItem.put("id", id); infoItem.put("minSecurityLevel", minSecurityLevel); infoItem.put("maxSecurityLevel", maxSecurityLevel); empGroupIdInfos.add(infoItem); - }else if (ApplicableOrganizationEnum.DEPARTMENT.getKey().equals(organzation.get("dxlx"))){ + }else if (ApplicableOrganizationEnum.DEPARTMENT.getKey().equals(organization.get("dxlx"))){ Map infoItem = new HashMap<>(); infoItem.put("id", id); infoItem.put("minSecurityLevel", minSecurityLevel); infoItem.put("maxSecurityLevel", maxSecurityLevel); depIdInfos.add(infoItem); - }else if (ApplicableOrganizationEnum.SUBCOMPANY.getKey().equals(organzation.get("dxlx"))){ + }else if (ApplicableOrganizationEnum.SUBCOMPANY.getKey().equals(organization.get("dxlx"))){ Map infoItem = new HashMap<>(); infoItem.put("id", id); infoItem.put("minSecurityLevel", minSecurityLevel); @@ -329,10 +329,10 @@ public class CommonUtil { if (!maxSecurityLevel.equals("")) { querySql = querySql + " and seclevel <= " +maxSecurityLevel; } - List> datas = DbTools.getSqlToList(querySql); + List> datas = DbTools.getSqlToListKeySmallLetter(querySql); log.info("querySql : " + querySql); if (datas.size() > 0) { - log.info("datas : " + datas); + log.info("datas.size : " + datas.size()); datas.forEach(f -> empIdList.add(f.get("id").toString())); } } @@ -351,10 +351,10 @@ public class CommonUtil { if (!maxSecurityLevel.equals("")) { querySql = querySql + " and seclevel <= " +maxSecurityLevel; } - List> datas = DbTools.getSqlToList(querySql); + List> datas = DbTools.getSqlToListKeySmallLetter(querySql); log.info("querySql : " + querySql); if (datas.size() > 0) { - log.info("datas : " + datas); + log.info("datas.size : " + datas.size()); datas.forEach(f -> empIdList.add(f.get("id").toString())); } } @@ -372,10 +372,10 @@ public class CommonUtil { if (!maxSecurityLevel.equals("")) { querySql = querySql + " and seclevel <= " +maxSecurityLevel; } - List> datas = DbTools.getSqlToList(querySql); + List> datas = DbTools.getSqlToListKeySmallLetter(querySql); log.info("querySql : " + querySql); if (datas.size() > 0) { - log.info("datas : " + datas); + log.info("datas.size : " + datas.size()); datas.forEach(f -> empIdList.add(f.get("id").toString())); } } @@ -391,7 +391,7 @@ public class CommonUtil { public static List getEmpGroupUserIds(String empGroupId){ String sql = "select b.mainid,b.empid,b.filters,b.bdate,b.edate,a.list_type from uf_ryqz a left join uf_ryqz_dt1 b on a.id=b.mainid where mainid = " + empGroupId; - List> personGroupDataList = DbTools.getSqlToList(sql); + List> personGroupDataList = DbTools.getSqlToListKeySmallLetter(sql); List empIdList = new ArrayList<>(); for (Map personGroupData :personGroupDataList){ @@ -414,7 +414,7 @@ public class CommonUtil { sql = sql+ " and "+filters; } log.info("getPersonnelGroupingByPerson filter sql : {}",sql); - List> dataList = DbTools.getSqlToList(sql); + List> dataList = DbTools.getSqlToListKeySmallLetter(sql); for (Map dataMap :dataList){ String hrmId = Util.null2String(dataMap.get("id")); String seclevel = Util.null2String(dataMap.get("seclevel"));