From f4e05a61c7420efbb61c9b7a5fb571490a56ffce Mon Sep 17 00:00:00 2001 From: liuliang <401809302@qq.com> Date: Fri, 26 Sep 2025 16:05:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrganaztionSeviceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/OrganaztionSeviceImpl.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/OrganaztionSeviceImpl.java index 925653d..ca7732c 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/OrganaztionSeviceImpl.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/OrganaztionSeviceImpl.java @@ -78,7 +78,7 @@ public class OrganaztionSeviceImpl implements OrganaztionService { throw new EmployeeJclRunTimeException("被删除组织下存在子部门"); } } - String sql = "update uf_organization_bghzzsj set delete_type='3',is_delete='1' where bh=? and form_data_id=? "; + String sql = "update uf_organization_bghzzsj set delete_type='3',is_delete='1',czlx='1' where bh=? and form_data_id=? "; databaseUtils.execute(sql,CommonUtils.getParamList(department.getBh(),department.getForm_data_id())); } @@ -88,10 +88,15 @@ public class OrganaztionSeviceImpl implements OrganaztionService { String sql = "select bh,zzmc,zz,czlx from uf_organization_bghzzsj where bh=? and form_data_id=? "; List> dataList = databaseUtils.getSqlList(sql,CommonUtils.getParamList(department.getSjzzbh(),department.getForm_data_id())); + List> nowDataList = databaseUtils.getSqlList(sql,CommonUtils.getParamList(department.getBh(),department.getForm_data_id())); + String czlx = CommonUtils.null2String(nowDataList.get(0).get("czlx")); + if (czlx.equals("")){ + czlx = "2"; + } sql = "update uf_organization_bghzzsj set zzmc=?,bmsqcj=?,bmfzr=?,fgld=?,sscb=?,bz=?,sjzzmc=?,sjzz=?,sjzzbh=?,czlx=? where bh=? and form_data_id=?"; databaseUtils.execute(sql,CommonUtils.getParamList(department.getZzmc(),department.getBmsqcj(),department.getBmfzr(),department.getFgld(),department.getSscb(),department.getBz(), - CommonUtils.null2String(dataList.get(0).get("zzmc")),CommonUtils.null2String(dataList.get(0).get("zz")),CommonUtils.null2String(dataList.get(0).get("bh")),department.getBh(),department.getForm_data_id())); + CommonUtils.null2String(dataList.get(0).get("zzmc")),CommonUtils.null2String(dataList.get(0).get("zz")),CommonUtils.null2String(dataList.get(0).get("bh")),czlx,department.getBh(),department.getForm_data_id())); } @@ -261,7 +266,7 @@ public class OrganaztionSeviceImpl implements OrganaztionService { @Override public List> getAfterChangeDepartmentTree(Map params) { String id = params.get("id"); - String sql = "select zz,bh id,sjzzbh,zzmc content,sjzzmc,sjzz,bmfzr,fgld,bmsqcj,bz,sscb,sjzzbh from uf_organization_bghzzsj where form_data_id=? and delete_type='0'"; + String sql = "select zz,bh id,sjzzbh,zzmc content,sjzzmc,sjzz,bmfzr,fgld,bmsqcj,bz,sscb,sjzzbh,czlx from uf_organization_bghzzsj where form_data_id=? and delete_type='0'"; List> dataList = databaseUtils.getSqlList(sql,CommonUtils.getParamList(id)); sql = "select id,username from eteams.employee";