diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java index cc97c6df..d599c6ab 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java @@ -29,6 +29,7 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.SysDept; import org.dromara.system.domain.SysUser; +import org.dromara.system.domain.vo.SysDeptVo; import org.dromara.system.domain.vo.SysDictDataVo; import org.dromara.system.mapper.SysDeptMapper; import org.dromara.system.mapper.SysUserMapper; @@ -642,7 +643,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat if(StrUtil.isNotEmpty(bo.getBureauDeptId())){ //查询人员所在区 - SysDept sysDept = iterationDeptParentRegion(bo.getBureauDeptId()); + SysDeptVo sysDept = iterationDeptParentRegion(bo.getBureauDeptId()); //存储数据产生的所在行政区 bo.setRegion(null!=sysDept?sysDept.getDeptName():""); bo.setRegionId(null!=sysDept?sysDept.getDeptId():""); @@ -665,9 +666,9 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat } - public SysDept iterationDeptParentRegion(String deptId) { + public SysDeptVo iterationDeptParentRegion(String deptId) { - SysDept dept = sysDeptMapper.electDeptById(deptId); + SysDeptVo dept = sysDeptMapper.selectDeptById(deptId); Optional op =Optional.ofNullable(dept); if(!op.isPresent() || deptId == null)return null; // 防止admin这种没有部门的进来后造成死循环 if (StringUtils.isNotEmpty(dept.getDeptType())) { diff --git a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java index ab036442..09b63300 100644 --- a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java +++ b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java @@ -119,4 +119,11 @@ public class SysDeptVo implements Serializable { * 排序号 */ private String sequence; + + /** + * 部门类型 + */ + private String deptType; + + } diff --git a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java index 295e71d6..bb03f6f0 100644 --- a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java +++ b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java @@ -167,6 +167,6 @@ public interface SysDeptMapper extends BaseMapperPlus { */ List selectDeptByRoleId(Long roleId); - SysDept electDeptById(String deptId); + SysDeptVo selectDeptById(String deptId); } diff --git a/zdxt-modules/zdxt-system/src/main/resources/mapper/system/SysDeptMapper.xml b/zdxt-modules/zdxt-system/src/main/resources/mapper/system/SysDeptMapper.xml index bce0b6b6..11db5b52 100644 --- a/zdxt-modules/zdxt-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/zdxt-modules/zdxt-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -15,4 +15,9 @@ from sys_dept d where d.dept_id = #{deptId} + +