diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnterpriseInformationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnterpriseInformationController.java index f50cd0e1..973dacce 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnterpriseInformationController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnterpriseInformationController.java @@ -1,15 +1,21 @@ package com.zdxt.enforcementcode.controller.app.enterprise; import cn.dev33.satoken.annotation.SaIgnore; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.zdxt.enforcementcode.domain.EnterpriseInformation; import com.zdxt.enforcementcode.domain.vo.EnterpriseInformationVo; import com.zdxt.enforcementcode.domain.vo.EnterpriseUserRefVo; import com.zdxt.enforcementcode.domain.vo.QrCodeGenerateHistoryVo; +import com.zdxt.enforcementcode.mapper.EnterpriseInformationMapper; import com.zdxt.enforcementcode.service.IEnterpriseInformationService; import com.zdxt.enforcementcode.service.IEnterpriseUserRefService; import com.zdxt.enforcementcode.service.IQrCodeGenerateHistoryService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.R; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,6 +36,8 @@ public class AppEntEnterpriseInformationController { private final IQrCodeGenerateHistoryService qrCodeGenerateHistoryService; private final IEnterpriseInformationService enterpriseInformationService; + private final EnterpriseInformationMapper enterpriseInformationMapper; + /** * 根据用户ID获取关联的企业信息列表 * @@ -70,19 +78,24 @@ public class AppEntEnterpriseInformationController { @SaIgnore @GetMapping("/getQrCode") public R> getQrCode(String enterpriseNumber) { - if (enterpriseNumber == null || enterpriseNumber.trim().isEmpty()) { - return R.fail("企业纳税识别号不能为空"); + + //根据当前登录用户部门ID 查询企业统一信用代码 + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(EnterpriseInformation::getDeptId, LoginHelper.getDeptId()); + EnterpriseInformation enterpriseInformation = enterpriseInformationMapper.selectOne(lqw); + if(enterpriseInformation == null){ + return R.fail("企业纳税识别号不存在"); } // 1. 查询最新的有效二维码记录 - QrCodeGenerateHistoryVo qrCodeVo = qrCodeGenerateHistoryService.queryLatestByEnterpriseNumber(enterpriseNumber); + QrCodeGenerateHistoryVo qrCodeVo = qrCodeGenerateHistoryService.queryLatestByEnterpriseNumber( enterpriseInformation.getEnterpriseNumber()); if (qrCodeVo == null) { return R.fail("未找到该企业的二维码记录"); } // 2. 查询企业名称(从企业信息表获取) String enterpriseName = ""; - EnterpriseInformationVo enterpriseInfo = enterpriseInformationService.queryByEnterpriseNumber(enterpriseNumber); + EnterpriseInformationVo enterpriseInfo = enterpriseInformationService.queryByEnterpriseNumber( enterpriseInformation.getEnterpriseNumber()); if (enterpriseInfo != null) { enterpriseName = enterpriseInfo.getEnterpriseName(); }