From 559ea407abffee8a208fd934b223c9b170cf35d6 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 7 Feb 2023 11:29:13 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E5=88=86=E6=9D=83?= =?UTF-8?q?=EF=BC=8C=E9=83=A8=E9=97=A8=E5=88=97=E8=A1=A8BUG=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/api/browser/service/impl/JobBrowserService.java | 2 +- .../engine/organization/entity/department/bo/DepartmentBO.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/api/browser/service/impl/JobBrowserService.java b/src/com/api/browser/service/impl/JobBrowserService.java index a229bb30..d587948f 100644 --- a/src/com/api/browser/service/impl/JobBrowserService.java +++ b/src/com/api/browser/service/impl/JobBrowserService.java @@ -130,7 +130,7 @@ public class JobBrowserService extends BrowserService { // 分权 DetachUtil detachUtil = new DetachUtil(user); if (detachUtil.isDETACH()) { - sqlWhere += " AND t.parent_comp in (" + detachUtil.getJclRoleLevels() + ")"; + sqlWhere += " AND t.ec_company in (" + detachUtil.getJclRoleLevels() + ")"; } return sqlWhere; } diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 9468c5c9..6841a0d7 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -159,7 +159,7 @@ public class DepartmentBO { return ""; } String departmentPrincipal = MapperProxyFactory.getProxy(DepartmentMapper.class).getDepartmentPrincipal(id); - if (StringUtils.isBlank(departmentPrincipal)) { + if (StringUtils.isBlank(departmentPrincipal) || "$NULL$".equalsIgnoreCase(departmentPrincipal)) { return ""; } List collect = Arrays.stream(departmentPrincipal.split(",")).map(Long::parseLong).collect(Collectors.toList()); From eaca9535d5fb43c05cebce846946303c838428ee Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 7 Feb 2023 14:41:31 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=88=86=E9=83=A8=E3=80=81=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=AF=BC=E5=85=A5BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/util/saveimport/CompanyImport.java | 4 +++- .../organization/util/saveimport/DepartmentImport.java | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/com/engine/organization/util/saveimport/CompanyImport.java b/src/com/engine/organization/util/saveimport/CompanyImport.java index bfd66af7..66b8854d 100644 --- a/src/com/engine/organization/util/saveimport/CompanyImport.java +++ b/src/com/engine/organization/util/saveimport/CompanyImport.java @@ -195,8 +195,10 @@ public class CompanyImport { try { if ("subcompanyname".equalsIgnoreCase(infoPO.getFieldName())) { reallyValue = cellValue; + } else if (StringUtils.isBlank(cellValue)) { + reallyValue = ""; } else { - reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), true); + reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), null != infoPO.getIsSystem() && 1 == infoPO.getIsSystem()); } } catch (Exception e) { historyDetailPO.setOperateDetail(cellValue + "转换失败"); diff --git a/src/com/engine/organization/util/saveimport/DepartmentImport.java b/src/com/engine/organization/util/saveimport/DepartmentImport.java index bd31cc58..6f05cd62 100644 --- a/src/com/engine/organization/util/saveimport/DepartmentImport.java +++ b/src/com/engine/organization/util/saveimport/DepartmentImport.java @@ -124,8 +124,8 @@ public class DepartmentImport { value += SystemEnv.getHtmlLabelName(28576, user.getLanguage()); item.put("link", templatePath); } - if(3==i){ - value = value.replace("及显示顺序",""); + if (3 == i) { + value = value.replace("及显示顺序", ""); } item.put("value", value); itemList.add(item); @@ -206,8 +206,10 @@ public class DepartmentImport { try { if ("departmentmark".equalsIgnoreCase(infoPO.getFieldName()) || "subcompanyid1".equalsIgnoreCase(infoPO.getFieldName())) { reallyValue = cellValue; + } else if (StringUtils.isBlank(cellValue)) { + reallyValue = ""; } else { - reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), true); + reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), null != infoPO.getIsSystem() && 1 == infoPO.getIsSystem()); } } catch (Exception e) { historyDetailPO.setOperateDetail(cellValue + "转换失败"); From 4113df170841fd02f47be08bb36553a568925f62 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 8 Feb 2023 14:05:33 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E7=AE=80=E5=8E=86=E6=A0=91=EF=BC=8C?= =?UTF-8?q?=E8=81=9A=E6=89=8D=E6=9E=97=E5=B2=97=E4=BD=8D=E6=90=9C=E7=B4=A2?= =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/JobBrowserService.java | 41 +++++++++++++++++++ .../organization/mapper/job/JobMapper.xml | 6 +++ 2 files changed, 47 insertions(+) diff --git a/src/com/api/browser/service/impl/JobBrowserService.java b/src/com/api/browser/service/impl/JobBrowserService.java index d587948f..a5f7e59a 100644 --- a/src/com/api/browser/service/impl/JobBrowserService.java +++ b/src/com/api/browser/service/impl/JobBrowserService.java @@ -26,6 +26,8 @@ import org.apache.commons.lang.StringUtils; import weaver.conn.RecordSet; import weaver.general.Util; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.*; import java.util.stream.Collectors; @@ -70,6 +72,45 @@ public class JobBrowserService extends BrowserService { return resultMap; } + @Override + public Map browserAutoComplete(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { + Map apidatas = new HashMap<>(); + String q = Util.null2String(httpServletRequest.getParameter("q")); + List sqlParams = new ArrayList<>(); + String keyword = ""; + if (q.length() > 0) keyword = "%" + q + "%"; + RecordSet rs = new RecordSet(); + String sqlwhere = " where t.delete_type = 0 "; + String backfields = "t.id, t.job_no, h.jobtitlename as name, t.sequence_id, t.scheme_id , t.grade_id , t.level_id "; + String fromSql = "FROM jcl_org_job t left join hrmjobtitles h on t.ec_jobTitle = h.id "; + String orderby = " order by t.id "; + sqlwhere += " "; + DetachUtil detachUtil = new DetachUtil(user); + if (detachUtil.isDETACH()) { + sqlwhere += " AND t.ec_company in (" + detachUtil.getJclRoleLevels() + ")"; + } + if (!"".equals(keyword)) { + sqlwhere += " and (h.jobtitlemark like ? or h.jobtitlename like ? or h.ecology_pinyin_search like ? )"; + sqlParams.add(keyword); + sqlParams.add(keyword); + sqlParams.add(keyword); + } + String sql = "select " + backfields + fromSql + sqlwhere + orderby; + rs.executeQuery(sql, sqlParams); + List> datas = new ArrayList<>(); + while (rs.next()) { + Map item = new HashMap<>(); + item.put("id", Util.null2String(rs.getString("id"))); + String name = Util.null2String(rs.getString("name")); + item.put("name", name); + item.put("title", name); + datas.add(item); + } + apidatas.put("datas", datas); + return apidatas; + } + + @Override public Map getBrowserConditionInfo(Map map) { Map> apiDatas = new HashMap<>(); diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index 7a28de6f..5af7f1ce 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -518,9 +518,15 @@ and t.ec_company = #{resourcePO.subcompanyid1} + + and t.ec_company is null + and t.ec_department = #{resourcePO.departmentid} + + and t.ec_department is null + and t.ec_jobTitle = #{resourcePO.jobtitle} From 453d4afe97c690bab4d52bd22b6be40cc9cab74a Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 14 Feb 2023 17:09:22 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=81=E5=AF=BC=E5=87=BABUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/resource/ResourceMapper.xml | 11 +++----- .../service/impl/HrmResourceServiceImpl.java | 25 +++++++++++++------ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/com/engine/organization/mapper/resource/ResourceMapper.xml b/src/com/engine/organization/mapper/resource/ResourceMapper.xml index a78fcf73..99b673da 100644 --- a/src/com/engine/organization/mapper/resource/ResourceMapper.xml +++ b/src/com/engine/organization/mapper/resource/ResourceMapper.xml @@ -111,12 +111,9 @@ from jcl_org_hrmresource t where delete_type = 0 and work_code = #{workCode} select distinct supDepId from hrmdepartment - where canceled = 0 + where 1=1 +