diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/common/service/impl/CommonServiceImpl.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/common/service/impl/CommonServiceImpl.java index 1c326dc..d886f74 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/common/service/impl/CommonServiceImpl.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/common/service/impl/CommonServiceImpl.java @@ -123,6 +123,7 @@ public class CommonServiceImpl implements CommonService { QueryDto queryDto = new QueryDto(); queryDto.setTableId(tableId); queryDto.setGroupId(groupId); + queryDto.setPageSize(9999); Map resultMap = dsSetService.getListDatas(SourceType.getSourceTypeByValue(sourceType),queryDto); resultList = (List>)resultMap.get("list"); } diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/ChangeOrganzationController.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/ChangeOrganzationController.java index 3c01572..ebf6c4b 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/ChangeOrganzationController.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/ChangeOrganzationController.java @@ -12,6 +12,7 @@ import com.weaver.seconddev.jcl.organization.entity.Department; import com.weaver.seconddev.jcl.organization.entity.Employee; import com.weaver.seconddev.jcl.organization.service.AuthorizedStrengthService; import com.weaver.seconddev.jcl.organization.service.OrganaztionService; +import com.weaver.seconddev.jcl.organization.service.SysDepartmentService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -30,6 +31,8 @@ public class ChangeOrganzationController extends BaseCommonController { @Autowired private OrganaztionService organaztionService; + @Autowired + private SysDepartmentService sysDepartmentService; /** * 添加员工部门 @@ -53,8 +56,11 @@ public class ChangeOrganzationController extends BaseCommonController { @PostMapping("/delOrganaztionDepartment") public WeaResult> delOrganaztionDepartment(@RequestBody Department department){ Map actionMap = new HashMap<>(); - organaztionService.delOrganaztionDepartment(department,this.getCurrentUser()); - + try { + organaztionService.delOrganaztionDepartment(department,this.getCurrentUser()); + }catch (Exception e){ + return WeaResult.fail(e.getMessage(),e); + } return WeaResult.success(actionMap); } /** diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/OrganaztionService.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/OrganaztionService.java index 285c7ad..2d3adb0 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/OrganaztionService.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/OrganaztionService.java @@ -26,4 +26,6 @@ public interface OrganaztionService { void updateDepartmentStatus(Map params); Map getDepartmentChangeToken(Map params); + + } diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/AuthorizedStrengthServiceImpl.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/AuthorizedStrengthServiceImpl.java index c5c9d0d..7c361e4 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/AuthorizedStrengthServiceImpl.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/AuthorizedStrengthServiceImpl.java @@ -8,7 +8,6 @@ import com.weaver.seconddev.jcl.organization.service.AuthorizedStrengthService; import com.weaver.seconddev.jcl.organization.util.CommonUtils; import com.weaver.seconddev.jcl.organization.util.DatabaseUtils; import com.weaver.seconddev.jcl.organization.util.DateUtil; -import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -95,17 +94,17 @@ public class AuthorizedStrengthServiceImpl implements AuthorizedStrengthService dataMap2.put("zy",personYdzqMonthMap.get("preAddEmpCount")); dataMap2.put("ysf",personYdzqMonthMap.get("preSubEmpCount")); dataMap2.put("kybz",personYdzqMonthMap.get("estLackCount")); - List> gradeList = (List>)personYdzqMonthMap.get("grade"); - String gradeIds = ""; - String gradeNames = ""; - for (Map gradeMap :gradeList){ - gradeIds += gradeMap.get("id")+","; - gradeNames += gradeMap.get("name")+","; - } - gradeIds = gradeIds.substring(0,gradeIds.length()-1); - gradeNames = gradeNames.substring(0,gradeNames.length()-1); - dataMap2.put("grade",gradeIds); - dataMap2.put("gradeName",gradeNames); +// List> gradeList = (List>)personYdzqMonthMap.get("grade"); +// String gradeIds = ""; +// String gradeNames = ""; +// for (Map gradeMap :gradeList){ +// gradeIds += gradeMap.get("id")+","; +// gradeNames += gradeMap.get("name")+","; +// } +// gradeIds = gradeIds.substring(0,gradeIds.length()-1); +// gradeNames = gradeNames.substring(0,gradeNames.length()-1); +// dataMap2.put("grade",gradeIds); +// dataMap2.put("gradeName",gradeNames); List> positionList = (List>)personYdzqMonthMap.get("position"); String positionIds = ""; @@ -167,15 +166,15 @@ public class AuthorizedStrengthServiceImpl implements AuthorizedStrengthService List> jobAdjustList = jobAdjustGroup.get(entry.getKey()); List> jobResultList = Lists.newArrayList(); if (jobAdjustList != null){ - Map>> jobGroupByPositionAndGradle = jobAdjustList.stream().collect(Collectors.groupingBy(e->e.get("position")+"&"+e.get("grade"))); + Map>> jobGroupByPositionAndGradle = jobAdjustList.stream().collect(Collectors.groupingBy(e->e.get("position").toString())); for (Map.Entry>> jobentry: jobGroupByPositionAndGradle.entrySet()){ Map jobResultMap = Maps.newHashMap(); List> jobList = jobentry.getValue(); jobResultMap.put("position",jobList.get(0).get("position")); jobResultMap.put("positionName",jobList.get(0).get("positionName")); - jobResultMap.put("grade",jobList.get(0).get("grade")); - jobResultMap.put("gradeName",jobList.get(0).get("gradeName")); +// jobResultMap.put("grade",jobList.get(0).get("grade")); +// jobResultMap.put("gradeName",jobList.get(0).get("gradeName")); jobResultMap.put("jobList",jobList); jobResultList.add(jobResultMap); } 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 366e0d5..d33b08a 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 @@ -9,6 +9,7 @@ import com.weaver.seconddev.jcl.common.service.CommonService; import com.weaver.seconddev.jcl.organization.entity.Department; import com.weaver.seconddev.jcl.organization.exception.EmployeeJclRunTimeException; import com.weaver.seconddev.jcl.organization.service.OrganaztionService; +import com.weaver.seconddev.jcl.organization.service.SysDepartmentService; import com.weaver.seconddev.jcl.organization.util.CommonUtils; import com.weaver.seconddev.jcl.organization.util.DatabaseUtils; import com.weaver.seconddev.jcl.organization.util.DateUtil; @@ -33,6 +34,9 @@ public class OrganaztionSeviceImpl implements OrganaztionService { private static final Logger log = LoggerFactory.getLogger(OrganaztionSeviceImpl.class); @Autowired private SyncDataUtils syncDataUtils; + @Autowired + private SysDepartmentService sysDepartmentService; + @Override @@ -58,8 +62,23 @@ public class OrganaztionSeviceImpl implements OrganaztionService { @Override public void delOrganaztionDepartment(Department department, SimpleEmployee employee) { - String sql = "update uf_organization_bghzzsj set delete_type='1' where bh=?"; - databaseUtils.execute(sql,CommonUtils.getParamList(department.getBh())); + String organzationId = department.getZz(); + if (organzationId != null){ + Map> listMap = sysDepartmentService.checkIsNotDisableDept(organzationId); + if (listMap.get("lowerDeptList").size() >0){ + throw new EmployeeJclRunTimeException("被删除组织有子部门"); + }else if (listMap.get("deptPersonList").size() >0){ + throw new EmployeeJclRunTimeException("被删除组织下存在人员"); + } + }else { + String querySql = "select * from uf_organization_bghzzsj where sjzzbh=?"; + List> list = databaseUtils.getSqlList(querySql,CommonUtils.getParamList(department.getBh())); + if (list.size() > 0){ + throw new EmployeeJclRunTimeException("被删除组织下存在子部门"); + } + } + String sql = "update uf_organization_bghzzsj set delete_type='3',is_delete='1' where bh=? and form_data_id=? "; + databaseUtils.execute(sql,CommonUtils.getParamList(department.getBh(),department.getForm_data_id())); }