diff --git a/zdxt-modules/zdxt-enforcement-code-common/src/main/java/com/zdxt/enforcementcode/domain/vo/UnitUserVo.java b/zdxt-modules/zdxt-enforcement-code-common/src/main/java/com/zdxt/enforcementcode/domain/vo/UnitUserVo.java index 40011195..a6468e69 100644 --- a/zdxt-modules/zdxt-enforcement-code-common/src/main/java/com/zdxt/enforcementcode/domain/vo/UnitUserVo.java +++ b/zdxt-modules/zdxt-enforcement-code-common/src/main/java/com/zdxt/enforcementcode/domain/vo/UnitUserVo.java @@ -1,6 +1,8 @@ package com.zdxt.enforcementcode.domain.vo; import lombok.Data; +import org.dromara.common.sensitive.annotation.Sensitive; +import org.dromara.common.sensitive.core.SensitiveStrategy; import java.io.Serial; import java.io.Serializable; @@ -42,8 +44,15 @@ public class UnitUserVo implements Serializable { /** * 手机号(市认证同步) */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobileNumber; + /** + * 手机号(来自sys_user.phonenumber) + */ + @Sensitive(strategy = SensitiveStrategy.PHONE) + private String phonenumber; + /** * 部门路径(来自sys_dept.zzDisplayPath,已去除"深圳市/"前缀) */ @@ -63,4 +72,9 @@ public class UnitUserVo implements Serializable { * 引用备注(仅引用人员列表使用,来自efcode_virtual_unit_user.remark) */ private String remark; + + /** + * 执法证件号 + */ + private String lawCertificateNum; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfSystemController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfSystemController.java index 3946bb5a..e92280ce 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfSystemController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfSystemController.java @@ -212,7 +212,7 @@ public class AppEnfSystemController extends BaseController { } /** - *执法端-分页查询用户 + *执法端-分页查询用户 dataScopeId ,notUserId,isShowCardId,userId,userName * @param bo * @param pageQuery * @return diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementLawNoticeController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementLawNoticeController.java index aab6be40..57db6df0 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementLawNoticeController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementLawNoticeController.java @@ -80,16 +80,25 @@ public class AppEnforcementLawNoticeController extends BaseController { ExcelUtil.exportExcel(list, "行政执法预告", EnforcementLawNoticeVo.class, response); } - /** + /* *//** * 获取行政执法预告详细信息 * * @param id 主键 - */ + *//* @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { return R.ok(enforcementLawNoticeService.queryById(id)); } +*/ + /** + * 获取预告详情 + */ + @GetMapping("/noticeDetails") + public R noticeDetails( String id) { + return R.ok(efcodeCpNoticeService.queryById(id)); + } + /** * 新增行政执法预告 diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeVirtualUnitMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeVirtualUnitMapper.xml index 3eb779ea..600a3128 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeVirtualUnitMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeVirtualUnitMapper.xml @@ -14,6 +14,7 @@ u.fullname AS fullname, u.mobileNumber AS mobileNumber, u.user_source AS userSource, + u .law_certificate_num as lawCertificateNum, REPLACE(COALESCE(d.zzDisplayPath, ''), '深圳市/', '') AS zzDisplayPath, @@ -25,7 +26,7 @@ FROM sys_user u LEFT JOIN sys_dept d ON u.dept_id = d.dept_id - WHERE u.del_flag = '0' + WHERE u.del_flag = '0' and d.dept_id != 405 AND (u.dept_id = #{sysDeptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE t.del_flag = '0' AND FIND_IN_SET(#{sysDeptId}, t.ancestors)