zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
FCL
2026-02-26 15:57:58 +08:00
parent 79598af898 23b9cde54f
commit a16693fcc5
5 changed files with 128 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java
View File

@@ -237,4 +237,6 @@ public interface ErrorCodeConstants {
ErrorCode RECORD_RECORD_NOT_EXISTS = new ErrorCode(1_032_350_000, "文件、模板、记录不存在"); ErrorCode RECORD_RECORD_NOT_EXISTS = new ErrorCode(1_032_350_000, "文件、模板、记录不存在");
ErrorCode RECORD_RELATION_NOT_EXISTS = new ErrorCode(1_032_350_000, "文件记录关系不存在"); ErrorCode RECORD_RELATION_NOT_EXISTS = new ErrorCode(1_032_350_000, "文件记录关系不存在");
ErrorCode RECORD_FILE_EXISTS = new ErrorCode(1_032_350_000, "文件记录目录存在文件"); ErrorCode RECORD_FILE_EXISTS = new ErrorCode(1_032_350_000, "文件记录目录存在文件");
ErrorCode RECORD_PERMISSION_NOT_ALLOW = new ErrorCode(1_032_350_401, "当前操作权限不允许");
ErrorCode RECORD_CATEGORY_NAME_EXISTS = new ErrorCode(1_032_350_400, "文件记录分类名称不能重复");
} }

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordapply/RecordApplyController.java
View File

@@ -38,7 +38,7 @@ import com.zt.plat.module.qms.resource.record.service.recordapply.RecordApplySer
@Tag(name = "管理后台 - 文件记录通用申请") @Tag(name = "管理后台 - 文件记录通用申请")
@RestController @RestController
@RequestMapping("/qms/record-apply") @RequestMapping("/qms/resource/record-apply")
@Validated @Validated
@DeptDataPermissionIgnore(enable = "true") @DeptDataPermissionIgnore(enable = "true")
@FileUploadController(source = "qms.recordapply") @FileUploadController(source = "qms.recordapply")

146
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordcategory/RecordCategoryServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordpermission/RecordPermissionService.java
View File

@@ -61,7 +61,7 @@ public interface RecordPermissionService {
*/ */
PageResult<RecordPermissionDO> getRecordPermissionPage(RecordPermissionPageReqVO pageReqVO); PageResult<RecordPermissionDO> getRecordPermissionPage(RecordPermissionPageReqVO pageReqVO);
List<RecordPermissionDO> selectAllList(); List<RecordPermissionDO> selectAllList(RecordPermissionDO recordPermissionDO);
RecordPermissionDO selectRecordPermission(RecordPermissionDO recordPermissionDO); RecordPermissionDO selectRecordPermission(RecordPermissionDO recordPermissionDO);
} }

13
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordpermission/RecordPermissionServiceImpl.java
View File

@@ -11,6 +11,7 @@ import com.zt.plat.module.qms.resource.record.controller.admin.recordpermission.
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import java.util.*; import java.util.*;
@@ -41,18 +42,22 @@ public class RecordPermissionServiceImpl implements RecordPermissionService {
// 查询所有记录权限列表 // 查询所有记录权限列表
@Override @Override
public List<RecordPermissionDO> selectAllList() { public List<RecordPermissionDO> selectAllList(RecordPermissionDO recordPermissionDO) {
LambdaQueryWrapper<RecordPermissionDO> wrapper = Wrappers.lambdaQuery();
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
Long tenantId = loginUser.getTenantId();// 租户ID Long tenantId = loginUser.getTenantId();// 租户ID
return recordPermissionMapper.selectList(RecordPermissionDO::getTenantId, tenantId); wrapper.eq(RecordPermissionDO::getTenantId, tenantId);
if (!ObjectUtils.isEmpty(recordPermissionDO.getCategoryId())) wrapper.eq(RecordPermissionDO::getCategoryId, recordPermissionDO.getCategoryId());
return recordPermissionMapper.selectList(wrapper);
} }
// 查询管理员-- 单条数据 // 查询管理员-- 单条数据
@Override @Override
public RecordPermissionDO selectRecordPermission(RecordPermissionDO recordPermissionDO) { public RecordPermissionDO selectRecordPermission(RecordPermissionDO recordPermissionDO) {
LambdaQueryWrapper<RecordPermissionDO> queryWrapper = Wrappers.lambdaQuery(); LambdaQueryWrapper<RecordPermissionDO> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(RecordPermissionDO::getDeleted, false) queryWrapper
.eq(RecordPermissionDO::getTenantId, recordPermissionDO.getTenantId())// 租户ID // .eq(RecordPermissionDO::getDeleted, false)
// .eq(RecordPermissionDO::getTenantId, recordPermissionDO.getTenantId())// 租户ID
.eq(RecordPermissionDO::getTargetId, recordPermissionDO.getTargetId()) .eq(RecordPermissionDO::getTargetId, recordPermissionDO.getTargetId())
.eq(RecordPermissionDO::getTargetType, recordPermissionDO.getTargetType()) .eq(RecordPermissionDO::getTargetType, recordPermissionDO.getTargetType())
.eq(RecordPermissionDO::getPermission, recordPermissionDO.getPermission()); .eq(RecordPermissionDO::getPermission, recordPermissionDO.getPermission());