From e7efddf976bdb5346160bb7c8d38aa0ea40bc68d Mon Sep 17 00:00:00 2001 From: qianshijiang <1965297290@qq.com> Date: Wed, 26 Nov 2025 11:57:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=85=8D=E7=BD=AEmybais-plus=E6=89=93?= =?UTF-8?q?=E5=8D=B0sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/logback-spring.xml | 5 +++++ .../module/mp/service/material/MpMaterialServiceImpl.java | 4 +++- .../src/main/resources/logback-spring.xml | 5 +++++ .../src/main/resources/logback-spring.xml | 5 +++++ .../src/main/resources/logback-spring.xml | 5 +++++ 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/zt-module-infra/zt-module-infra-server/src/main/resources/logback-spring.xml b/zt-module-infra/zt-module-infra-server/src/main/resources/logback-spring.xml index c23fa5d2..12667617 100644 --- a/zt-module-infra/zt-module-infra-server/src/main/resources/logback-spring.xml +++ b/zt-module-infra/zt-module-infra-server/src/main/resources/logback-spring.xml @@ -64,6 +64,11 @@ + + + + + diff --git a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/material/MpMaterialServiceImpl.java b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/material/MpMaterialServiceImpl.java index 8dbfcb6c..d6fabca7 100644 --- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/material/MpMaterialServiceImpl.java +++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/material/MpMaterialServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.module.infra.api.file.FileApi; +import com.zt.plat.module.infra.api.file.dto.FileCreateReqDTO; import com.zt.plat.module.mp.controller.admin.material.vo.MpMaterialPageReqVO; import com.zt.plat.module.mp.controller.admin.material.vo.MpMaterialUploadNewsImageReqVO; import com.zt.plat.module.mp.controller.admin.material.vo.MpMaterialUploadPermanentReqVO; @@ -218,7 +219,8 @@ public class MpMaterialServiceImpl implements MpMaterialService { private String uploadFile(String mediaId, File file) { String path = mediaId + "." + FileTypeUtil.getType(file); - return fileApi.createFile(FileUtil.readBytes(file), path); + FileCreateReqDTO createReqDTO = new FileCreateReqDTO().setName(file.getName()).setDirectory(path).setType(FileTypeUtil.getType(file)).setContent(FileUtil.readBytes(file)); + return fileApi.createFile(createReqDTO).getData(); } } diff --git a/zt-module-mp/zt-module-mp-server/src/main/resources/logback-spring.xml b/zt-module-mp/zt-module-mp-server/src/main/resources/logback-spring.xml index c23fa5d2..95e649be 100644 --- a/zt-module-mp/zt-module-mp-server/src/main/resources/logback-spring.xml +++ b/zt-module-mp/zt-module-mp-server/src/main/resources/logback-spring.xml @@ -64,6 +64,11 @@ + + + + + diff --git a/zt-module-report/zt-module-report-server/src/main/resources/logback-spring.xml b/zt-module-report/zt-module-report-server/src/main/resources/logback-spring.xml index c23fa5d2..4d382fe0 100644 --- a/zt-module-report/zt-module-report-server/src/main/resources/logback-spring.xml +++ b/zt-module-report/zt-module-report-server/src/main/resources/logback-spring.xml @@ -64,6 +64,11 @@ + + + + + diff --git a/zt-module-system/zt-module-system-server/src/main/resources/logback-spring.xml b/zt-module-system/zt-module-system-server/src/main/resources/logback-spring.xml index c23fa5d2..df2f1c4b 100644 --- a/zt-module-system/zt-module-system-server/src/main/resources/logback-spring.xml +++ b/zt-module-system/zt-module-system-server/src/main/resources/logback-spring.xml @@ -64,6 +64,11 @@ + + + + + From a10732119b80031cf468bd630341d20cb1eaa488 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Wed, 26 Nov 2025 12:38:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?iwork=20=E4=BA=BA=E5=91=98=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E5=90=8C=E6=AD=A5=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/user/vo/user/UserSaveReqVO.java | 4 ++++ .../iwork/impl/IWorkSyncProcessorImpl.java | 1 + .../system/service/user/AdminUserServiceImpl.java | 12 +++++++----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/user/UserSaveReqVO.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/user/UserSaveReqVO.java index 049c6875..be32c302 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/user/UserSaveReqVO.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/user/UserSaveReqVO.java @@ -92,6 +92,10 @@ public class UserSaveReqVO { @JsonIgnore private boolean skipMobileValidation; + @Schema(hidden = true) + @JsonIgnore + private boolean skipEmailValidation; + // ========== 仅【创建】时，需要传递的字段 ========== @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456") diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncProcessorImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncProcessorImpl.java index 9ed9fdbd..dc3ba48c 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncProcessorImpl.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncProcessorImpl.java @@ -440,6 +440,7 @@ public class IWorkSyncProcessorImpl implements IWorkSyncProcessor { req.setStatus(status.getStatus()); req.setSkipAssociationValidation(true); req.setSkipMobileValidation(true); + req.setSkipEmailValidation(true); return req; } diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserServiceImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserServiceImpl.java index 4fc1267e..03689c12 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserServiceImpl.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserServiceImpl.java @@ -109,7 +109,7 @@ public class AdminUserServiceImpl implements AdminUserService { // 1.2 校验正确性 validateUserForCreateOrUpdate(null, createReqVO.getUsername(), createReqVO.getMobile(), createReqVO.getEmail(), createReqVO.getDeptIds(), createReqVO.getPostIds(), - createReqVO.isSkipAssociationValidation(), createReqVO.isSkipMobileValidation()); + createReqVO.isSkipAssociationValidation(), createReqVO.isSkipMobileValidation(), createReqVO.isSkipEmailValidation()); // 2.1 插入用户 AdminUserDO user = BeanUtils.toBean(createReqVO, AdminUserDO.class); user.setStatus(CommonStatusEnum.ENABLE.getStatus()); @@ -155,7 +155,7 @@ public class AdminUserServiceImpl implements AdminUserService { } }); // 1.3 校验正确性 - validateUserForCreateOrUpdate(null, registerReqVO.getUsername(), null, null, null, null, false, false); + validateUserForCreateOrUpdate(null, registerReqVO.getUsername(), null, null, null, null, false, false, false); // 2. 插入用户 AdminUserDO user = BeanUtils.toBean(registerReqVO, AdminUserDO.class); @@ -175,7 +175,7 @@ public class AdminUserServiceImpl implements AdminUserService { // 1. 校验正确性 AdminUserDO oldUser = validateUserForCreateOrUpdate(updateReqVO.getId(), updateReqVO.getUsername(), updateReqVO.getMobile(), updateReqVO.getEmail(), updateReqVO.getDeptIds(), - updateReqVO.getPostIds(), updateReqVO.isSkipAssociationValidation(), updateReqVO.isSkipMobileValidation()); + updateReqVO.getPostIds(), updateReqVO.isSkipAssociationValidation(), updateReqVO.isSkipMobileValidation(), updateReqVO.isSkipEmailValidation()); // 2.1 只更新非空字段 AdminUserDO updateObj = new AdminUserDO(); @@ -515,7 +515,7 @@ public class AdminUserServiceImpl implements AdminUserService { private AdminUserDO validateUserForCreateOrUpdate(Long id, String username, String mobile, String email, Set deptIds, Set postIds, boolean skipAssociationValidation, - boolean skipMobileValidation) { + boolean skipMobileValidation, boolean skipEmailValidation) { // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确 return DataPermissionUtils.executeIgnore(() -> { // 校验用户存在 @@ -527,7 +527,9 @@ public class AdminUserServiceImpl implements AdminUserService { validateMobileUnique(id, mobile); } // 校验邮箱唯一 - validateEmailUnique(id, email); + if (!skipEmailValidation) { + validateEmailUnique(id, email); + } // 校验岗位处于开启状态 if (!skipAssociationValidation) { postService.validatePostList(postIds);