From 4a311738feaf7e08485de897073b627955515a15 Mon Sep 17 00:00:00 2001 From: ganhao Date: Sat, 30 May 2026 16:53:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=AB=AF=E5=8E=86=E5=8F=B2=E6=89=A7=E6=B3=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEntEnforcementRegistrationController.java | 1 + .../impl/EnforcementRegistrationServiceImpl.java | 15 +++++++++++++++ .../EnforcementRegistrationMapper.xml | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java index 88074520..e88c36c5 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java @@ -10,6 +10,7 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java index d7a5ce8c..b82eeaf5 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java @@ -7,10 +7,12 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zdxt.enforcementcode.common.annotation.DataScope; +import com.zdxt.enforcementcode.common.commonenum.PlatformTypeEnums; import com.zdxt.enforcementcode.domain.*; import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationQueryBo; import com.zdxt.enforcementcode.domain.vo.EnterpriseEvaluateVo; +import com.zdxt.enforcementcode.domain.vo.EnterpriseInformationVo; import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationDetailVo; import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationInfoVo; import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationListVo; @@ -66,6 +68,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat private final LinkageDictMapper linkageDictMapper; private final ZdxtFileMapper zdxtFileMapper; private final SysDeptMapper sysDeptMapper; + private final EnterpriseInformationMapper enterpriseInformationMapper; /** * 查询企业端-执法登记记录 @@ -395,6 +398,18 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat */ @Override public TableDataInfo queryEnforcementRegistrationPageList(EnforcementRegistrationQueryBo bo, PageQuery pageQuery) { + + Integer platformTypelan = LoginHelper.getPlatformType(); + if(platformTypelan == PlatformTypeEnums.ENTERPRISE.getKey()){ + String companyid = LoginHelper.getDeptId();//企业端 + EnterpriseInformationVo enterpriseInformationVo = enterpriseInformationMapper.selectVoById(companyid); + if(enterpriseInformationVo != null){ + bo.setEnterpriseNumber(enterpriseInformationVo.getEnterpriseNumber()); + } + } + + + Page page = pageQuery.build(); IPage result = baseMapper.selectEnforcementRegistrationPage(page, bo); List records = result.getRecords(); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml index b45de080..7eb412f4 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml @@ -219,7 +219,7 @@ AND is_delete = 0 - ORDER BY update_time DESC + ORDER BY update_time DESC,create_time DESC