diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java index 563855ea..3cfdf6f7 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java @@ -101,11 +101,12 @@ public class AppEnforcementRegistrationController extends BaseController { /** * 执法端-查询执法记录-全市-本单位 */ + @SaIgnore @GetMapping("/queryList") @ResponseBody public R queryList(EnforcementRegistrationBo bo, PageQuery pageQuery) { // dateType本单位 0 全市 1 - if (Objects.nonNull(bo.getUserId()) && bo.getDateType()==0) { + if (Objects.nonNull( LoginHelper.getUserId()) && bo.getWarnType()==0) { bo.setDeptId(LoginHelper.getDeptId() == null ? null : LoginHelper.getDeptId()); SysDeptVo bureauDept = sysDeptService.iterationDeptParentToBureau(LoginHelper.getDeptId()); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java index 4cd39cca..3014ca37 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java @@ -315,4 +315,9 @@ public class EnforcementRegistrationBo extends BaseEntity { private String region; private String regionId; + /** + * 提醒类型 0:本单位 1:全市 + */ + private Integer warnType; + } 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 315534a4..138da585 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 @@ -562,6 +562,10 @@ and t.num >= #{bo.num} + + order by t.num desc