From 8f32d81845dba3640862de2a6e81fb3efb06ad7d Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Mon, 31 Mar 2025 13:28:19 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=201=E3=80=81=E4=BC=98=E5=8C=96=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=AF=94=E5=AF=B9=E9=A2=84=E8=AD=A6=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/RemoteBusinessAlertService.java | 8 +++ .../business/domain/vo/BusinessAlertVo.java | 2 + .../dubbo/RemoteBusinessAlertServiceImpl.java | 17 ++++- .../business/mapper/BusinessAlertMapper.java | 3 + .../service/IBusinessAlertService.java | 1 + .../impl/BusinessAlertServiceImpl.java | 67 ++++++++++++++++++- .../BusinessAlertStatisticsServiceImpl.java | 2 +- .../mapper/business/BusinessAlertMapper.xml | 19 +++++- .../service/impl/AiCompareServiceImpl.java | 11 ++- .../controller/system/SysDeptController.java | 10 +++ .../dubbo/RemoteLabelPostServicelmpl.java | 4 ++ .../dromara/system/mapper/SysDeptMapper.java | 3 +- .../system/service/ISysDeptService.java | 2 + .../service/impl/SysDeptServiceImpl.java | 5 ++ .../resources/mapper/system/SysDeptMapper.xml | 19 ++++++ .../resources/mapper/system/SysPostMapper.xml | 5 +- pom.xml | 2 +- 17 files changed, 168 insertions(+), 12 deletions(-) diff --git a/dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessAlertService.java b/dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessAlertService.java index 9597fd3..39f16f0 100644 --- a/dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessAlertService.java +++ b/dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessAlertService.java @@ -5,6 +5,7 @@ import org.dromara.business.api.domain.bo.RemoteBusinessAlertBo; import org.dromara.business.api.domain.vo.RemoteBusinessAlertVo; import java.util.List; +import java.util.Map; /** * 预警服务 @@ -37,4 +38,11 @@ public interface RemoteBusinessAlertService { * @return */ Boolean deleteAlert(List alertIdList); + + /** + * 更新部门信息 + * @param alertList + */ + void batchUpdateDept(List> alertList); + } diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessAlertVo.java b/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessAlertVo.java index d621d4e..af7aae7 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessAlertVo.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessAlertVo.java @@ -208,4 +208,6 @@ public class BusinessAlertVo implements Serializable { * 指派人员名称 */ private String assignUserName; + + private Date createTime; } diff --git a/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessAlertServiceImpl.java index 7f262dd..b333a93 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessAlertServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessAlertServiceImpl.java @@ -1,22 +1,20 @@ package org.dromara.business.dubbo; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.business.api.RemoteBusinessAlertService; import org.dromara.business.api.domain.bo.RemoteBusinessAlertBo; import org.dromara.business.api.domain.vo.RemoteBusinessAlertVo; - import org.dromara.business.domain.vo.BusinessAlertVo; import org.dromara.business.service.IBusinessAlertService; import org.dromara.business.utils.MinioUntil; import org.dromara.business.utils.constants.MinIOConstants; - import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.net.URL; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -74,4 +72,17 @@ public class RemoteBusinessAlertServiceImpl implements RemoteBusinessAlertServic public Boolean deleteAlert(List alertIdList) { return businessAlertService.deleteAlert(alertIdList); } + + @Override + public void batchUpdateDept(List> alertList) { + List alertVoList = alertList.stream().map(alert -> { + BusinessAlertVo businessAlertVo = new BusinessAlertVo(); + businessAlertVo.setDeptId(alert.get("deptId").toString()); + businessAlertVo.setDeptName(alert.get("deptName").toString()); + businessAlertVo.setId(Long.valueOf(alert.get("id").toString())); + return businessAlertVo; + }).toList(); + + businessAlertService.batchUpdateDept(alertVoList); + } } diff --git a/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java b/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java index 7f7698d..132db14 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java +++ b/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; import org.dromara.business.domain.BusinessAlert; import org.dromara.business.domain.bo.BusinessAlertBo; import org.dromara.business.domain.vo.BusinessAlertVo; @@ -94,4 +95,6 @@ public interface BusinessAlertMapper extends BaseMapperPlus streetTopAlert(@Param("param") BusinessAlertBo businessAlertBo,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("deptIdList") List deptIdList); List> countLabelRateAlert(@Param("param") BusinessAlertBo businessAlertBo,@Param("startTime") String startTime,@Param("endTime") String endTime); + + void batchUpdateDept(@Param("list") List alertVoList); } diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java index c047cc8..5a61a2e 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java @@ -79,4 +79,5 @@ public interface IBusinessAlertService { Boolean deleteAlert(List alertIdList); + void batchUpdateDept(List alertVoList); } diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java index 982642d..ad7c797 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java @@ -16,6 +16,8 @@ import org.dromara.business.domain.bo.BusinessAlertBo; import org.dromara.business.domain.vo.BusinessAlertVo; import org.dromara.business.mapper.BusinessAlertMapper; import org.dromara.business.service.IBusinessAlertService; +import org.dromara.business.utils.MinioUntil; +import org.dromara.business.utils.constants.MinIOConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; @@ -31,6 +33,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.lang.reflect.Method; +import java.net.URL; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.Collections; @@ -146,7 +149,9 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { wrapper.set(BusinessAlert::getAssignDate, new Date()); } - wrapper.set(BusinessAlert::getCompleteDate,new Date()); + if (BusinessStatusEnum.FINISH.getStatus().equalsIgnoreCase(flowStatus) || BusinessStatusEnum.CANCEL.getStatus().equalsIgnoreCase(flowStatus)){ + wrapper.set(BusinessAlert::getCompleteDate,new Date()); + } wrapper.eq(BusinessAlert::getId, businessId); @@ -170,6 +175,13 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { Page page = this.baseMapper.pageBusinessAlert(pageQuery.build(), wrapper); + page.getRecords().forEach(businessAlertVo->{ + businessAlertVo.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getImages(), 3600).toString()); + businessAlertVo.setMaxImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMaxImages(), 3600).toString()); + businessAlertVo.setMaxMateSourceImgUrl(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMaxMateSourceImgUrl(), 3600).toString()); + businessAlertVo.setMateSourceImgUrl(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMateSourceImgUrl(), 3600).toString()); + }); + return TableDataInfo.build(page); } @@ -192,6 +204,13 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { Page page = this.baseMapper.pageBusinessAlertCancel(pageQuery.build(), wrapper); + page.getRecords().forEach(businessAlertVo->{ + businessAlertVo.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getImages(), 3600).toString()); + businessAlertVo.setMaxImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMaxImages(), 3600).toString()); + businessAlertVo.setMaxMateSourceImgUrl(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMaxMateSourceImgUrl(), 3600).toString()); + businessAlertVo.setMateSourceImgUrl(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMateSourceImgUrl(), 3600).toString()); + }); + return TableDataInfo.build(page); } @@ -216,6 +235,13 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { Page page = this.baseMapper.pageAlertFinish(pageQuery.build(), wrapper); + page.getRecords().forEach(businessAlertVo->{ + businessAlertVo.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getImages(), 3600).toString()); + businessAlertVo.setMaxImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMaxImages(), 3600).toString()); + businessAlertVo.setMaxMateSourceImgUrl(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMaxMateSourceImgUrl(), 3600).toString()); + businessAlertVo.setMateSourceImgUrl(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMateSourceImgUrl(), 3600).toString()); + }); + return TableDataInfo.build(page); } @@ -253,6 +279,13 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { }); } + page.getRecords().forEach(businessAlertVo->{ + businessAlertVo.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getImages(), 3600).toString()); + businessAlertVo.setMaxImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMaxImages(), 3600).toString()); + businessAlertVo.setMaxMateSourceImgUrl(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMaxMateSourceImgUrl(), 3600).toString()); + businessAlertVo.setMateSourceImgUrl(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMateSourceImgUrl(), 3600).toString()); + }); + return TableDataInfo.build(page); } @@ -339,7 +372,15 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { //查看的是总览的预警信息 if (ObjectUtil.isEmpty(businessAlertBo.getPostCode())) { - result.put("list",this.baseMapper.listAlert(businessAlertBo,startTime,endTime)); + + List businessAlerts = this.baseMapper.listAlert(businessAlertBo, startTime, endTime); + + businessAlerts.forEach(businessAlertVo->{ + URL url = MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getImages(), 3600); + businessAlertVo.setImages(url.toString()); + }); + + result.put("list",businessAlerts); return result; } @@ -351,6 +392,11 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { List alertList = this.baseMapper.listAlert(businessAlertBo, startTime, endTime); + alertList.forEach(businessAlertVo->{ + URL url = MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getImages(), 3600); + businessAlertVo.setImages(url.toString()); + }); + handlerMap.put("total",alertList.size()); handlerMap.put("finishCount",ObjectUtil.isEmpty(alertList)?0:alertList.stream().filter(p-> p.getHandleType().equalsIgnoreCase(BusinessStatusEnum.FINISH.getStatus())).count()); handlerMap.put("todoCount",ObjectUtil.isEmpty(alertList)?0:alertList.stream().filter(p-> p.getHandleType().equalsIgnoreCase(BusinessStatusEnum.WAITING.getStatus())).count()); @@ -397,12 +443,24 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { List alertList = this.baseMapper.listAlert(businessAlertBo, startTime, endTime); + alertList.forEach(businessAlertVo->{ + URL url = MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getImages(), 3600); + businessAlertVo.setImages(url.toString()); + }); + + Map labelCnMap = alertList.stream() .collect(Collectors.groupingBy( BusinessAlert::getLabelEn, Collectors.summingInt(e -> 1) )); + businessAlertBo.getAiLabelEnList().forEach(labelEn -> { + if (ObjectUtil.isEmpty(labelCnMap.get(labelEn))) { + labelCnMap.put(labelEn,0); + } + }); + infoMap.put("panel",labelCnMap); infoMap.put("list",alertList); @@ -432,6 +490,11 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { return this.baseMapper.delete(wrapper) > 0; } + @Override + public void batchUpdateDept(List alertVoList) { + this.baseMapper.batchUpdateDept(alertVoList); + } + public static List getLastSixDays() { List days = new ArrayList<>(7); diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java index 204e4f6..14dcade 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java @@ -495,7 +495,7 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist Long deptId = LoginHelper.getDeptId(); //获取街道信息 List streetList = remoteDeptService.selectListByParentId(String.valueOf(deptId)); - List deptIdList = streetList.stream().map(RemoteDeptVo::getDeptId).filter(id -> !id.equals(deptId)).distinct().toList(); + List deptIdList = streetList.stream().filter(p-> p.getParentId().equals(deptId)).map(RemoteDeptVo::getDeptId).distinct().toList(); List> top5Map = this.baseMapper.countStreetAlert(businessAlertBo,startTime,endTime,deptIdList); diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml index a541adb..b73248b 100644 --- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml +++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml @@ -475,8 +475,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM warning_summary ws LEFT JOIN business_alert ba ON ws.label_en = ba.label_en - WHERE - 1=1 and ba.handle_type != 'verify' and = #{startTime} ]]> and @@ -736,5 +734,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + UPDATE business_alert + SET + dept_id = + + WHEN #{item.id} THEN #{item.deptId} + , + dept_name = + + WHEN #{item.id} THEN #{item.deptName} + + WHERE id IN + + #{item.id} + + + diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java index 130fbf9..69bb9e5 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java @@ -17,6 +17,7 @@ import org.dromara.business.api.domain.vo.RemoteBusinessAlertVo; import org.dromara.common.core.constant.AiCompareStatusConstants; import org.dromara.common.core.constant.BusinessConstants; +import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; @@ -70,7 +71,7 @@ public class AiCompareServiceImpl implements IAiCompareService { @DubboReference private final RemoteBusinessAlertService businessAlertService; - @DubboReference + @DubboReference(timeout = 30000) private RemoteWorkflowService remoteWorkflowService; @Override @@ -244,8 +245,13 @@ public class AiCompareServiceImpl implements IAiCompareService { return businessAlertService.deleteAlert(ids); } + @Transactional(rollbackFor = Exception.class) @Override public Boolean commitAlert(List> alertList) { + if (ObjectUtil.isEmpty(alertList)) { + throw new ServiceException("预警信息为空!"); + } + List startProcessList = alertList.stream().map(map -> { String flowCode = remoteWorkflowService.getFlowCode(map.get("labelEn").toString()); RemoteStartProcess remoteStartProcess = new RemoteStartProcess(); @@ -254,6 +260,9 @@ public class AiCompareServiceImpl implements IAiCompareService { return remoteStartProcess; }).toList(); + //更新部门信息 + businessAlertService.batchUpdateDept(alertList); + return remoteWorkflowService.startWorkFlowBatch(startProcessList); } diff --git a/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysDeptController.java index 1855a20..33fa9ff 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysDeptController.java +++ b/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysDeptController.java @@ -42,6 +42,16 @@ public class SysDeptController extends BaseController { return R.ok(depts); } + /** + * 获取部门列表 + */ + @SaCheckPermission("system:dept:list") + @GetMapping("/list/tree/{deptId}") + public R> listTreeDept(@PathVariable Long deptId) { + List depts = deptService.listTreeDept(deptId); + return R.ok(depts); + } + /** * 查询部门列表（排除节点） * diff --git a/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteLabelPostServicelmpl.java b/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteLabelPostServicelmpl.java index e907873..6e01a70 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteLabelPostServicelmpl.java +++ b/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteLabelPostServicelmpl.java @@ -4,6 +4,7 @@ import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.api.RemoteLabelPostService; import org.dromara.system.api.domain.vo.RemoteAiLabelPostVo; import org.dromara.system.domain.AiLabel; @@ -34,6 +35,9 @@ public class RemoteLabelPostServicelmpl implements RemoteLabelPostService { @Override public List selectLabelByList(String postCode, Long deptId) { + if (LoginHelper.isSuperAdmin()){ + deptId = null; + } //获取岗位只能Id SysPostVo sysPostVo = sysPostService.selectLableByList(postCode, deptId); if(sysPostVo != null){ diff --git a/dk-modules/system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/dk-modules/system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java index 3d0f3e4..b875fb1 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java +++ b/dk-modules/system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java @@ -55,7 +55,7 @@ public interface SysDeptMapper extends BaseMapperPlus { */ default List selectListByParentId(Long parentId) { return this.selectList(new LambdaQueryWrapper() - .select(SysDept::getDeptId,SysDept::getDeptName) + .select(SysDept::getDeptId,SysDept::getDeptName,SysDept::getParentId) .apply(DataBaseHelper.findInSet(parentId, "ancestors"))); } @@ -72,4 +72,5 @@ public interface SysDeptMapper extends BaseMapperPlus { List> getNamePathList(); + List listTreeDept(@Param("deptId") Long deptId); } diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/ISysDeptService.java b/dk-modules/system/src/main/java/org/dromara/system/service/ISysDeptService.java index fea3d52..8a1aa4f 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/ISysDeptService.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/ISysDeptService.java @@ -155,4 +155,6 @@ public interface ISysDeptService { SysDeptVo getByParentId(String deptId); + + List listTreeDept(Long deptId); } diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java index 884337e..bd72fee 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -381,4 +381,9 @@ public class SysDeptServiceImpl implements ISysDeptService { return BeanUtil.copyProperties(sysDept, SysDeptVo.class); } + @Override + public List listTreeDept(Long deptId) { + return baseMapper.listTreeDept(deptId); + } + } diff --git a/dk-modules/system/src/main/resources/mapper/system/SysDeptMapper.xml b/dk-modules/system/src/main/resources/mapper/system/SysDeptMapper.xml index e75d498..dbd2264 100644 --- a/dk-modules/system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/dk-modules/system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -84,4 +84,23 @@ deptId + + diff --git a/dk-modules/system/src/main/resources/mapper/system/SysPostMapper.xml b/dk-modules/system/src/main/resources/mapper/system/SysPostMapper.xml index 3c12889..8663f73 100644 --- a/dk-modules/system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/dk-modules/system/src/main/resources/mapper/system/SysPostMapper.xml @@ -27,7 +27,10 @@