From fa24b15983ae5c93d88ff81515858a8e44ba9d2f Mon Sep 17 00:00:00 2001 From: shenzhidan Date: Fri, 9 Jan 2026 18:18:15 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E6=9D=83=E9=99=90?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=202=E3=80=81=E4=BF=AE=E6=94=B9=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E8=AF=81=E7=85=A7=E8=A1=A8=E7=9A=84=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/certificate/web/UserCertificateController.java | 2 ++ .../com/zcloud/certificate/dto/UserCertificateAddCmd.java | 6 +++++- .../zcloud/certificate/dto/UserCertificateUpdateCmd.java | 5 ++++- .../certificate/dto/clientobject/UserCertificateCO.java | 5 ++++- .../persistence/dataobject/UserCertificateDO.java | 4 +++- .../persistence/mapper/UserCertificateMapper.java | 5 +++++ 6 files changed, 23 insertions(+), 4 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java b/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java index 9fbdbdf..75ce478 100644 --- a/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java +++ b/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java @@ -16,6 +16,7 @@ import com.jjb.saas.framework.auth.utils.AuthContext; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -41,6 +42,7 @@ public class UserCertificateController { @ApiOperation("分页") @PostMapping("/list") + @PreAuthorize("@pms.hasAnyPermission('gfd-tzzyrugl', 'gfd-tzsbczrygl', 'gfd-qyzyfzrgl','gfd-qyaqscglrygl', 'qyd-tzzyrugl', 'qyd-tzsbczrygl', 'qyd-zyfzrgl','qyd-aqscglrygl', 'xgfd-zyfzrgl', 'xgfd-tzzzsbczrygl', 'xgfd-aqscglrygl','xgfd-tzzyrugl')") public PageResponse page(@RequestBody UserCertificatePageQry qry) { return userCertificateService.listPage(qry); } diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateAddCmd.java b/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateAddCmd.java index 7ab55a8..b75c62c 100644 --- a/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateAddCmd.java +++ b/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateAddCmd.java @@ -34,7 +34,11 @@ public class UserCertificateAddCmd extends Command { @ApiModelProperty(value = "1-特种作业，2-特种设备，3-主要负责人，4-安全生产管理人员", name = "type", required = true) @NotNull(message = "1-特种作业，2-特种设备，3-主要负责人，4-安全生产管理人员不能为空") - private Integer type; + private String type; + + @ApiModelProperty(value = "人员类型名称", name = "typeName", required = true) + @NotEmpty(message = "人员类型名称不能为空") + private String typeName; @ApiModelProperty(value = "证书名称", name = "certificateName", required = true) @NotEmpty(message = "证书名称不能为空") diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateUpdateCmd.java b/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateUpdateCmd.java index 64623d0..01b30b3 100644 --- a/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateUpdateCmd.java @@ -35,7 +35,10 @@ public class UserCertificateUpdateCmd extends Command { private Long userId; @ApiModelProperty(value = "1-特种作业，2-特种设备，3-主要负责人，4-安全生产管理人员", name = "type", required = true) @NotNull(message = "1-特种作业，2-特种设备，3-主要负责人，4-安全生产管理人员不能为空") - private Integer type; + private String type; + @ApiModelProperty(value = "人员类型名称", name = "typeName", required = true) + @NotEmpty(message = "人员类型名称不能为空") + private String typeName; @ApiModelProperty(value = "证书名称", name = "certificateName", required = true) @NotEmpty(message = "证书名称不能为空") private String certificateName; diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCertificateCO.java b/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCertificateCO.java index 7ce0721..5322e68 100644 --- a/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCertificateCO.java +++ b/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCertificateCO.java @@ -35,7 +35,10 @@ public class UserCertificateCO extends ClientObject { private Integer employmentStatus; //1-特种作业，2-特种设备，3-主要负责人，4-安全生产管理人员 @ApiModelProperty(value = "1-特种作业，2-特种设备，3-主要负责人，4-安全生产管理人员") - private Integer type; + private String type; + //人员类型名称 + @ApiModelProperty(value = "人员类型名称") + private String typeName; //证书名称 @ApiModelProperty(value = "证书名称") private String certificateName; diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/UserCertificateDO.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/UserCertificateDO.java index a258dc2..62bd78b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/UserCertificateDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/UserCertificateDO.java @@ -33,7 +33,9 @@ public class UserCertificateDO extends BaseDO { private Long userId; //1-特种作业，2-特种设备，3-主要负责人，4-安全生产管理人员 @ApiModelProperty(value = "1-特种作业，2-特种设备，3-主要负责人，4-安全生产管理人员") - private Integer type; + private String type; + @ApiModelProperty(value = "人员类型名称") + private String typeName; //证书名称 @ApiModelProperty(value = "证书名称") private String certificateName; diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/UserCertificateMapper.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/UserCertificateMapper.java index fefc5f8..31112a4 100644 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/UserCertificateMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/UserCertificateMapper.java @@ -1,6 +1,8 @@ package com.zcloud.certificate.persistence.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.datascope.annotation.DataScope; +import com.jjb.saas.framework.datascope.annotation.DataScopes; import com.zcloud.certificate.persistence.dataobject.UserCertificateDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zcloud.certificate.persistence.dataobject.UserCertificateStatDO; @@ -16,6 +18,9 @@ import java.util.Map; * @Date 2026-01-06 08:47:20 */ @Mapper +@DataScopes({ + @DataScope(method = "selectPageWithUser", menuPerms = "zhgl2") +}) public interface UserCertificateMapper extends BaseMapper { /**