From 225fe394912a2691c1f9023937368d2b0d966761 Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Mon, 13 Oct 2025 20:59:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3getCompanyId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BmCompanyAddressController.java | 6 ++--- .../impl/BmCompanyAddressServiceImpl.java | 5 ++++ .../service/impl/BmMessageServiceImpl.java | 24 ++++++++++++------- .../basic/service/impl/ToDoServiceImpl.java | 4 +++- .../service/impl/DevInfoServiceImpl.java | 8 +++---- .../service/impl/MaDevQcServiceImpl.java | 5 ++-- .../service/impl/SysDeptServiceImpl.java | 2 +- .../order/service/impl/OrderServiceImpl.java | 12 +++++----- 8 files changed, 41 insertions(+), 25 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/BmCompanyAddressController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/BmCompanyAddressController.java index cdc08fb..96cdcc2 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/BmCompanyAddressController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/BmCompanyAddressController.java @@ -1,6 +1,7 @@ package com.bonus.material.basic.controller; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotNull; @@ -46,7 +47,7 @@ public class BmCompanyAddressController extends BaseController { @GetMapping("/list") public TableDataInfo list(BmCompanyAddress bmCompanyAddress) { startPage(); - bmCompanyAddress.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); + bmCompanyAddress.setCompanyId(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId())); List list = bmCompanyAddressService.selectBmCompanyAddressList(bmCompanyAddress); return getDataTable(list); } @@ -85,7 +86,6 @@ public class BmCompanyAddressController extends BaseController { @PostMapping public AjaxResult add(@RequestBody BmCompanyAddress bmCompanyAddress) { try { - bmCompanyAddress.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); return toAjax(bmCompanyAddressService.insertBmCompanyAddress(bmCompanyAddress)); } catch (Exception e) { return error("系统错误, " + e.getMessage()); @@ -105,7 +105,7 @@ public class BmCompanyAddressController extends BaseController { return error("ID不能为空"); } try { - bmCompanyAddress.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); + bmCompanyAddress.setCompanyId(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId())); return toAjax(bmCompanyAddressService.updateBmCompanyAddress(bmCompanyAddress)); } catch (Exception e) { return error("系统错误, " + e.getMessage()); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmCompanyAddressServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmCompanyAddressServiceImpl.java index f4d1ba1..658e16f 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmCompanyAddressServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmCompanyAddressServiceImpl.java @@ -1,8 +1,11 @@ package com.bonus.material.basic.service.impl; import java.util.List; +import java.util.Optional; + import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.material.basic.mapper.BmCompanyAddressMapper; @@ -50,6 +53,8 @@ public class BmCompanyAddressServiceImpl implements IBmCompanyAddressService { */ @Override public int insertBmCompanyAddress(BmCompanyAddress bmCompanyAddress) { + bmCompanyAddress.setCompanyId(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()) + .orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId())); bmCompanyAddress.setCreateTime(DateUtils.getNowDate()); try { return bmCompanyAddressMapper.insertBmCompanyAddress(bmCompanyAddress); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java index 300fe40..0cddcb1 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java @@ -46,7 +46,8 @@ public class BmMessageServiceImpl implements IBmMessageService { */ @Override public List selectBmMessageList(BmMessage bmMessage) { - Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); + Long companyId = Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()) + .orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()); bmMessage.setFromCompany(companyId); bmMessage.setToCompany(companyId); List messages = bmMessageMapper.selectBmMessageList(bmMessage); @@ -56,7 +57,8 @@ public class BmMessageServiceImpl implements IBmMessageService { @Override public List selectBmMessageListOne(BmMessage bmMessage) { - Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); + Long companyId = Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()) + .orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()); bmMessage.setFromCompany(bmMessage.getFromCompany()); bmMessage.setToCompany(companyId); List messages = bmMessageMapper.selectBmMessageListOne(bmMessage); @@ -65,7 +67,8 @@ public class BmMessageServiceImpl implements IBmMessageService { @Override public List selectBmMessageListFromCache(BmMessage bmMessage) { - Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); + Long companyId = Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()) + .orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()); RedisService redisService = SpringUtils.getBean(RedisService.class); // 获取所有消息缓存 key @@ -102,7 +105,8 @@ public class BmMessageServiceImpl implements IBmMessageService { @Override public List selectBmMessageListFromCacheOne(BmMessage bmMessage) { - Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); + Long companyId = Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()) + .orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()); Long toCompany = bmMessage.getToCompany(); RedisService redisService = SpringUtils.getBean(RedisService.class); @@ -152,7 +156,8 @@ public class BmMessageServiceImpl implements IBmMessageService { */ @Override public BmMessage getNoReadNum(BmMessage bmMessage) { - bmMessage.setToCompany(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); + bmMessage.setToCompany(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()) + .orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId())); return bmMessageMapper.getNoReadNum(bmMessage); } @@ -166,7 +171,8 @@ public class BmMessageServiceImpl implements IBmMessageService { public int insertBmMessage(BmMessage bmMessage) { bmMessage.setCreateTime(DateUtils.getNowDate()); try { - Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); + Long companyId = Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()) + .orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()); bmMessage.setFromCompany(companyId); bmMessage.setFromUser(SecurityUtils.getLoginUser().getSysUser().getUserId()); bmMessage.setUuid(String.valueOf(UUID.randomUUID())); @@ -200,7 +206,8 @@ public class BmMessageServiceImpl implements IBmMessageService { try { bmMessageMapper.updateBmMessage(bmMessage); //Redis - Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); + Long companyId = Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()) + .orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()); Collection keys1 = SpringUtils.getBean(RedisService.class).keys(MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE + bmMessage.getFromCompany() + ":" + companyId); Collection keys2 = SpringUtils.getBean(RedisService.class).keys(MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE + companyId + ":" + bmMessage.getToCompany()); List keys = new ArrayList<>(); @@ -222,7 +229,8 @@ public class BmMessageServiceImpl implements IBmMessageService { public int updateBmMessageAll(BmMessage bmMessage) { bmMessage.setIsRead(1); bmMessage.setUpdateTime(DateUtils.getNowDate()); - Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); + Long companyId = Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()) + .orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()); bmMessage.setToCompany(companyId); for (Long fromCompany : bmMessage.getFromCompanys()) { try { diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java index c6fd64f..29da51f 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; +import java.util.Optional; @Service @Slf4j @@ -24,7 +25,8 @@ public class ToDoServiceImpl implements ToDoService { @Override public List getToDoList(ToDoBean bean) { - bean.setNoticeCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); + bean.setNoticeCompanyId(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()) + .orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId())); return toDoMapper.getToDoList(bean); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index c7761ee..c5f3758 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -717,7 +717,7 @@ public class DevInfoServiceImpl implements DevInfoService { */ @Override public List selectDevInfoLists(DevInfoVo devInfo) { - devInfo.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId().toString()); + devInfo.setCompanyId(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()).toString()); List list = devInfoMapper.selectDevInfoLists(devInfo); if (!CollectionUtils.isEmpty(list)) { for (DevInfoVo infoVo : list) { @@ -828,7 +828,7 @@ public class DevInfoServiceImpl implements DevInfoService { devInfo.setCode(getString()); DevInfo devInfo1 = new DevInfo(); BeanUtils.copyProperties(devInfo, devInfo1); - devInfo1.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId().toString()); + devInfo1.setCompanyId(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()).toString()); devInfo1.setMaStatus(0); devInfoMapper.insertDevInfo(devInfo1); successNum++; @@ -878,13 +878,13 @@ public class DevInfoServiceImpl implements DevInfoService { @Override public List selectAssociationList(DevInfoVo devInfo) { - devInfo.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId().toString()); + devInfo.setCompanyId(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()).toString()); return devInfoMapper.selectAssociationList(devInfo); } @Override public List getTagDevList(DevInfoVo devInfoVo) { - devInfoVo.setOwnCo(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); + devInfoVo.setOwnCo(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId())); return devInfoMapper.getTagDevList(devInfoVo); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevQcServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevQcServiceImpl.java index 5100d6b..3268189 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevQcServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevQcServiceImpl.java @@ -20,6 +20,7 @@ import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; +import java.util.Optional; /** * @Author ma_sh @@ -64,7 +65,7 @@ public class MaDevQcServiceImpl implements MaDevQcService { maDevQc.setQcCode(code); maDevQc.setCreateBy(String.valueOf(SecurityUtils.getUserId())); maDevQc.setCreateTime(DateUtils.getNowDate()); - maDevQc.setQcCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId().toString()); + maDevQc.setQcCom(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()).toString()); int result = maDevQcMapper.insertDevQc(maDevQc); devInfoMapper.updateDevInfoIsQc(maDevQc); if (result > 0 && maDevQc.getId() != null) { @@ -93,7 +94,7 @@ public class MaDevQcServiceImpl implements MaDevQcService { maDevQc.setQcCode(code); maDevQc.setCreateBy(String.valueOf(SecurityUtils.getUserId())); maDevQc.setCreateTime(DateUtils.getNowDate()); - maDevQc.setQcCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId().toString()); + maDevQc.setQcCom(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()).toString()); int result = maDevQcMapper.insertDevQc(maDevQc); devInfoMapper.updateDevInfoIsQc(maDevQc); if (result > 0 && maDevQc.getId() != null) { diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/impl/SysDeptServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/impl/SysDeptServiceImpl.java index 6ef904f..d705cf1 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/impl/SysDeptServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/service/impl/SysDeptServiceImpl.java @@ -425,7 +425,7 @@ public class SysDeptServiceImpl implements ISysDeptService { String str = dept.getDeptName().replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_"); dept.setDeptName(str); } - dept.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); + dept.setCompanyId(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId())); return mapper.selectDeptList(dept); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index ba86d57..54a426d 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -143,7 +143,7 @@ public class OrderServiceImpl implements OrderService { Long userid = SecurityUtils.getLoginUser().getUserid(); orderInfoDto.setBuyerId(userid.intValue()); - orderInfoDto.setBuyerCompany(SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue()); + orderInfoDto.setBuyerCompany(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()).intValue()); orderInfoDto.setCreater(userid); Integer i = orderMapper.insertOrderInfo(orderInfoDto); j += i; @@ -159,7 +159,7 @@ public class OrderServiceImpl implements OrderService { tmTask.setCode(code); tmTask.setCreateBy(SecurityUtils.getLoginUser().getUsername()); tmTask.setCreateTime(DateUtils.getNowDate()); - tmTask.setBuyerCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); + tmTask.setBuyerCompanyId(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId())); if (!CollectionUtils.isEmpty(orderDetailDtos)) { DevInfoVo devInfoVo = devInfoMapper.selectDevInfoByMaId(Long.valueOf(orderDetailDtos.get(0).getMaId())); tmTask.setSellerCompanyId(Long.valueOf(devInfoVo.getCompanyId())); @@ -173,9 +173,9 @@ public class OrderServiceImpl implements OrderService { @Override public List getOrderDetails(OrderInfoDto orderInfoDto) throws Exception { if (orderInfoDto.isFlag()) { - orderInfoDto.setSellerCompany(SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue()); + orderInfoDto.setSellerCompany(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()).intValue()); } else { - orderInfoDto.setBuyerCompany(SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue()); + orderInfoDto.setBuyerCompany(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()).intValue()); } List orderInfoDtos = orderMapper.getOrderDetails(orderInfoDto); @@ -337,9 +337,9 @@ public class OrderServiceImpl implements OrderService { public List getOrderStatusCount(OrderDetailDto dto) throws Exception { //true:出租方 false:承租方 if (dto.isFlag()) { - dto.setSellerCompany(SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue()); + dto.setSellerCompany(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()).intValue()); } else { - dto.setBuyerCompany(SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue()); + dto.setBuyerCompany(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()).intValue()); } List orderInfoDto = orderMapper.getOrderStatusCount(dto); int total = 0;