From a351557e5dd00afc87470e00081db9ed122d938c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 20 Feb 2024 14:13:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E5=9B=BE?= =?UTF-8?q?=E5=88=86=E6=9D=83BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ChartServiceImpl.java | 6 ++-- .../service/impl/OrgChartServiceImpl.java | 32 +++++++++++-------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java index 03072abf..bb9755b2 100644 --- a/src/com/engine/organization/service/impl/ChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java @@ -1310,8 +1310,10 @@ public class ChartServiceImpl extends Service implements ChartService { // 一级分部数据分权处理 if (isRealTime && user.getUID() != 1 && isRealDimension) { DetachUtil detachUtil = new DetachUtil(user); - String ids = detachUtil.getJclRoleLevels(); - sql = sql + " and a.id in ("+ids+")"; + if(detachUtil.isDETACH()) { + String ids = detachUtil.getJclRoleLevels(); + sql = sql + " and a.id in (" + ids + ")"; + } } break; case "1": diff --git a/src/com/engine/organization/service/impl/OrgChartServiceImpl.java b/src/com/engine/organization/service/impl/OrgChartServiceImpl.java index 14c8b6b1..53ca2237 100644 --- a/src/com/engine/organization/service/impl/OrgChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/OrgChartServiceImpl.java @@ -69,8 +69,10 @@ public class OrgChartServiceImpl extends Service implements OrgChartService { boolean isRealTime = StringUtils.isBlank(id) || "0".equals(id); if (isRealTime && user.getUID() != 1 && isRealDimension) { DetachUtil detachUtil = new DetachUtil(user); - String ids = detachUtil.getJclRoleLevels(); - sql = sql + " and id in ("+ids+")"; + if(detachUtil.isDETACH()) { + String ids = detachUtil.getJclRoleLevels(); + sql = sql + " and id in (" + ids + ")"; + } } rs.executeQuery(sql); @@ -106,9 +108,11 @@ public class OrgChartServiceImpl extends Service implements OrgChartService { judgeTreeLeafSql = sql; if (isRealTime && user.getUID() != 1 && isRealDimension) { DetachUtil detachUtil = new DetachUtil(user); - String ids = detachUtil.getJclRoleLevels(); - if ("0".equals(subcompany)) { - sql = sql + " and id in ("+ids+")"; + if (detachUtil.isDETACH()) { + String ids = detachUtil.getJclRoleLevels(); + if ("0".equals(subcompany)) { + sql = sql + " and id in (" + ids + ")"; + } } } if (StringUtils.isNotBlank(fclass) && !"0".equals(fclass)) { @@ -123,7 +127,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService { sql += " and versionid = " + id; judgeTreeLeafSql = sql; } - rs.executeQuery(sql,subcompany); + rs.executeQuery(sql, subcompany); while (rs.next()) { companyTree.add(CompanyTreePO.builder().id(rs.getString("id")).pId(rs.getString("pId")).value(rs.getString("value")).title(rs.getString("title")).isLeaf(judgeTreeLeaf(judgeTreeLeafSql, rs.getString("id"))).build()); } @@ -622,25 +626,25 @@ public class OrgChartServiceImpl extends Service implements OrgChartService { RecordSet rs = new RecordSet(); String recordDate = OrganizationDateUtil.getFormatLocalDateTime(LocalDateTime.now()); String createDate = OrganizationDateUtil.getFormatLocalDate(LocalDate.now()); - rs.executeQuery("select id from JCL_ORG_CHARTVERSION where fclass = ? and createtime = ?",fclass,createDate); + rs.executeQuery("select id from JCL_ORG_CHARTVERSION where fclass = ? and createtime = ?", fclass, createDate); rs.next(); String id = Util.null2String(rs.getString("id")); - if(StringUtils.isNotEmpty(id)){ - rs.executeUpdate("update JCL_ORG_CHARTVERSION set recorddate = ?,description = ?,creator = ? where fclass = ? and createtime = ?",recordDate,description,user.getUID(),fclass,createDate); - }else { - rs.executeUpdate("insert into JCL_ORG_CHARTVERSION (recorddate,description,creator,deletetype,createtime,fclass) values(?,?,?,?,?,?)",recordDate,description,user.getUID(),0,createDate,fclass); + if (StringUtils.isNotEmpty(id)) { + rs.executeUpdate("update JCL_ORG_CHARTVERSION set recorddate = ?,description = ?,creator = ? where fclass = ? and createtime = ?", recordDate, description, user.getUID(), fclass, createDate); + } else { + rs.executeUpdate("insert into JCL_ORG_CHARTVERSION (recorddate,description,creator,deletetype,createtime,fclass) values(?,?,?,?,?,?)", recordDate, description, user.getUID(), 0, createDate, fclass); } } @Override public Map searchTimeLines(Map params) { - Map datas = new HashMap<>(); + Map datas = new HashMap<>(); RecordSet rs = new RecordSet(); String fclass = Util.null2String(params.get("fclass")); List timeLinesBOList = new ArrayList<>(); timeLinesBOList.add(TimeLinesBO.builder().key(0).id(0).title("当前版本").color("blue").time("").build()); - rs.executeQuery("SELECT id,recorddate,description from JCL_ORG_CHARTVERSION where fclass = ? and deletetype = ? order by id desc",fclass,0); + rs.executeQuery("SELECT id,recorddate,description from JCL_ORG_CHARTVERSION where fclass = ? and deletetype = ? order by id desc", fclass, 0); while (rs.next()) { timeLinesBOList.add(TimeLinesBO.builder() .key(rs.getInt("id")) @@ -651,7 +655,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService { .build()); } - datas.put("timelineList",timeLinesBOList); + datas.put("timelineList", timeLinesBOList); return datas; } -- 2.40.0.windows.1