From 700ac5685214d37f128b3ad3dfda59e80381b9f6 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 16 一月 2025 17:52:38 +0800
Subject: [PATCH] 修改创建人更新人，修改文件所属人对比
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
index 75f17d0..7a0745f 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
@@ -11,6 +11,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.FileUploadResult;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.dnc.exception.ExceptionCast;
import org.jeecg.modules.dnc.mapper.DocInfoMapper;
@@ -24,6 +25,7 @@
import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.dnc.response.*;
+import org.jeecg.modules.system.service.ISysDictService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
@@ -349,11 +351,10 @@
if(file == null || file.isEmpty() || !ValidateUtil.validateString(id))
ExceptionCast.cast(CommonCode.INVALID_PARAM);
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- String userId = user.getId();
- if(!ValidateUtil.validateString(userId))
+ if(!ValidateUtil.validateString(user.getUsername()))
ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
FileOperate operate = fileOperateService.getByDocId(id);
- if(operate == null || !userId.equals(operate.getCreateUser()))
+ if(operate == null || !user.getUsername().equals(operate.getCreateBy()))
ExceptionCast.cast(DocumentCode.DOC_OPERATE_PUSH_FAIL);
DocInfo en = super.getById(id);
if(en == null)
@@ -525,11 +526,10 @@
if(!ValidateUtil.validateString(id))
ExceptionCast.cast(CommonCode.INVALID_PARAM);
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- String userId = user.getId();
- if(!ValidateUtil.validateString(userId))
+ if(!ValidateUtil.validateString(user.getUsername()))
ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
FileOperate operate = fileOperateService.getByDocId(id);
- if(operate == null || !userId.equals(operate.getCreateUser()))
+ if(operate == null || !user.getUsername().equals(operate.getCreateBy()))
ExceptionCast.cast(DocumentCode.DOC_CANCEL_PULL_ERROR);
DocInfo en = super.getById(id);
if(en == null)
@@ -547,7 +547,7 @@
}
@Override
- public QueryPageResponseResult<DocInfo> findPageList(int page, int size, DocInfoQueryRequest docQuery) {
+ public Result<?> findPageList(int page, int size, DocInfoQueryRequest docQuery) {
if(page < 1 || size < 1) {
ExceptionCast.cast(CommonCode.INVALID_PAGE);
}
@@ -589,7 +589,7 @@
// ((Page<DocInfo>) pageData).setDesc(descStr);
}
IPage<DocInfo> docInfoIPage = super.getBaseMapper().findDocExtList(pageData, queryWrapper);
- return new QueryPageResponseResult<>(CommonCode.SUCCESS, docInfoIPage);
+ return Result.ok(docInfoIPage);
}
@Override
--
Gitblit v1.9.3