From 9d438b0028b1319fa8de3fc68460f3fca33f7f60 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 5 Jan 2024 14:43:18 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8):=2079826?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsStandardizationServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java index 9560071a..9e5ce002 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.SnowflakeUtils; import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile; import com.jero.modules.laws.dataCenter.service.ILawsDataCenterFileService; @@ -22,6 +23,7 @@ import com.jero.modules.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -111,6 +113,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl standardizationMeetingList) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); for (LawsStandardizationMeeting standardizationMeeting : standardizationMeetingList) { standardizationMeeting.setStandardizationId(lawsStandardization.getId()); @@ -141,8 +144,8 @@ public class LawsStandardizationServiceImpl extends ServiceImpl sysDeparts = sysDepartService.queryDepartsByUsername(standardizationMeeting.getCreateBy()); SysUser sysUser = sysUserService.getUserByName(standardizationMeeting.getCreateBy()); List orgCodeList = sysDeparts.stream().map(SysDepart::getOrgCode).collect(Collectors.toList()); - lawsDataCenterFile.setOwnerId(sysUser.getId()); - lawsDataCenterFile.setUploader(sysUser.calcNameWorkNo()); + lawsDataCenterFile.setOwnerId(Objects.isNull(sysUser) ? loginUser.getId() : sysUser.getId()); + lawsDataCenterFile.setUploader(Objects.isNull(sysUser) ? loginUser.calcNameWorkNo() : sysUser.calcNameWorkNo()); lawsDataCenterFile.setOrgCode(String.join(",", orgCodeList)); lawsDataCenterFileService.add(lawsDataCenterFile); }