ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(标准化活动): 79826

Browse Source
This commit is contained in:
yjz
2024-01-05 14:43:18 +08:00
parent a3905dd6fb
commit 9d438b0028
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
+5 -2
View File
@@ -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<LawsStandardizat
* @param standardizationMeetingList 标准化-参会记录
*/
private void saveOrUpdateMeeting(LawsStandardization lawsStandardization, List<LawsStandardizationMeeting> standardizationMeetingList) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
for (LawsStandardizationMeeting standardizationMeeting : standardizationMeetingList) {
standardizationMeeting.setStandardizationId(lawsStandardization.getId());
@@ -141,8 +144,8 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
List<SysDepart> sysDeparts = sysDepartService.queryDepartsByUsername(standardizationMeeting.getCreateBy());
SysUser sysUser = sysUserService.getUserByName(standardizationMeeting.getCreateBy());
List<String> 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);
}