From 10f044147ce99fb753d5e3f3858ac3a6a79e01ab Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Mon, 6 Jan 2025 19:00:03 +0800 Subject: [PATCH] =?UTF-8?q?fix(dept):=20=E4=BF=AE=E5=A4=8D=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=A4=84?= =?UTF-8?q?=E7=90=86=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -修复公司名称处理中的空指针异常 - 增加对总部公司的查询条件 - 为工厂信息中的部门设置正确的类型 --- .../bpm/controller/admin/definition/BpmProcessCcController.java | 2 +- .../yudao/module/system/service/dept/DeptServiceImpl.java | 2 ++ .../service/factoryinfo/FactoryInfoServiceImpl.java | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessCcController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessCcController.java index 65078ee1..6d33ed2f 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessCcController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessCcController.java @@ -103,7 +103,7 @@ public class BpmProcessCcController { .collect(Collectors.joining("、"))); // 设置公司名称 data.setCompanyName(data.getCompanyDeptId().stream() - .map(item -> deptMap.get(item).getName()) + .map(item -> deptMap.get(item) != null ? deptMap.get(item).getName() : "") .collect(Collectors.joining("、"))); }); return success(respVOPageResult); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java index fc84275c..cd3c7944 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java @@ -334,6 +334,8 @@ public class DeptServiceImpl implements DeptService { return deptMapper.selectList(new LambdaQueryWrapperX() .eq(DeptDO::getType, DeptTypeEnum.COMPANY.getValue()) + .or() + .eq(DeptDO::getType, DeptTypeEnum.HEAD_COMPANY.getValue()) .eq(DeptDO::getVirtuallyStatus, 0) .eq(DeptDO::getStatus, CommonStatusEnum.ENABLE.getStatus())); } diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java index c733d0ec..dd1c5775 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.smartfactory.service.factoryinfo; import cn.hutool.core.collection.CollectionUtil; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.framework.common.enums.DeptTypeEnum; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.ip.core.Area; @@ -71,6 +72,7 @@ public class FactoryInfoServiceImpl implements FactoryInfoService { deptRespDTO.setParentId(169L); //这里设置上级部门为 生产部 deptRespDTO.setLeaderUserId(createReqVO.getLeaderUserId()); deptRespDTO.setStatus(CommonStatusEnum.ENABLE.getStatus()); + deptRespDTO.setType(DeptTypeEnum.PRODUCTION_DEPT.getValue()); deptRespDTO.setVirtuallyStatus(0); deptApi.createDept(deptRespDTO); }