Merge remote-tracking branch 'origin/feature_主分支合并UI优化' into feature_主分支合并UI优化

2026-08-26 13:50:26 +08:00
parent cc2b3b8ab5 e57b712134
commit 0dd3a66a90
27 changed files with 1828 additions and 432 deletions
@@ -131,7 +131,8 @@ public class SysSignatureController {
    @Aop(TransAop.READ_COMMITTED)
    public Result update(@Param("file") TempFile tempFile) {
        String url = sysFileService.uploadReturnUrl(SysFileEngineTypeEnum.MINIO.getValue(), tempFile);
-        Sys_user_signature sysUserSignature = dao.fetch(Sys_user_signature.class);
+        // 签字记录必须按当前登录用户读取，避免后续用户更新时覆盖其他用户的签字。
+        Sys_user_signature sysUserSignature = dao.fetch(Sys_user_signature.class, Cnd.where(Sys_user_signature::getUserId, "=", SecurityUtil.getUserId()));
        if (ObjectUtil.isNull(sysUserSignature)) {
            sysUserSignature = new Sys_user_signature();
        }