From 3341599719e0ae63889b6bfb4eea3cf4521b0ab8 Mon Sep 17 00:00:00 2001 From: heheng <475597332@qq.com> Date: 星期二, 01 七月 2025 10:00:49 +0800 Subject: [PATCH] 新功能模块 --- multi-system/src/main/java/com/gkhy/exam/system/service/impl/StandardizedTemplateServiceImpl.java | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/StandardizedTemplateServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/StandardizedTemplateServiceImpl.java index 24f47a1..0f653e5 100644 --- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/StandardizedTemplateServiceImpl.java +++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/StandardizedTemplateServiceImpl.java @@ -41,7 +41,7 @@ boolean admin = SecurityUtils.adminUser(); if (!admin){ if (companyId==null){ - throw new ApiException("非管理员操作,查询条件不可为空"); + companyId = SecurityUtils.getCompanyId().intValue(); } } PageUtils.startPage(); @@ -53,7 +53,7 @@ public CommonResult insertStandardizedTemplate(StandardizedTemplate standardizedTemplate) { LoginUserDetails loginUser = SecurityUtils.getLoginUser(); - SysCompany sysCompany = sysCompanyService.selectCompanyById(SecurityUtils.getCompanyId()); + SysCompany sysCompany = sysCompanyService.selectCompanyById(standardizedTemplate.getCompanyId().longValue()); standardizedTemplate.setCompanyName(sysCompany.getName()); standardizedTemplate.setCreateBy(loginUser.getUsername()); standardizedTemplate.setCreateTime(LocalDateTime.now()); @@ -67,7 +67,7 @@ @Override public CommonResult updateStandardizedTemplate(StandardizedTemplate standardizedTemplate) { LoginUserDetails loginUser = SecurityUtils.getLoginUser(); - SysCompany sysCompany = sysCompanyService.selectCompanyById(SecurityUtils.getCompanyId()); + SysCompany sysCompany = sysCompanyService.selectCompanyById(standardizedTemplate.getCompanyId().longValue()); standardizedTemplate.setCompanyName(sysCompany.getName()); standardizedTemplate.setUpdateBy(loginUser.getUsername()); standardizedTemplate.setUpdateTime(LocalDateTime.now()); @@ -95,10 +95,15 @@ @Override public CommonResult selectStandardizedQuality(Integer companyId) { - LambdaQueryWrapper<StandardizedQuality> lambdaQueryWrapper = Wrappers.<StandardizedQuality>lambdaQuery() - .eq(StandardizedQuality::getCompanyId, companyId) - .eq(StandardizedQuality::getDelFlag, 0); - return CommonResult.success(standardizedQualityMapper.selectOne(lambdaQueryWrapper)); + boolean admin = SecurityUtils.adminUser(); + LambdaQueryWrapper<StandardizedQuality> lambdaQueryWrapper = Wrappers.<StandardizedQuality>lambdaQuery(); + if (!admin){ + if (companyId==null){ + lambdaQueryWrapper.eq(StandardizedQuality::getCompanyId, SecurityUtils.getCompanyId().intValue()); + } + } + lambdaQueryWrapper.eq(StandardizedQuality::getDelFlag, 0); + return CommonResult.success(standardizedQualityMapper.selectList(lambdaQueryWrapper)); } @Override @@ -107,7 +112,7 @@ standardizedQualityMapper.delete(eq); LoginUserDetails loginUser = SecurityUtils.getLoginUser(); - SysCompany sysCompany = sysCompanyService.selectCompanyById(SecurityUtils.getCompanyId()); + SysCompany sysCompany = sysCompanyService.selectCompanyById(standardizedQuality.getCompanyId().longValue()); standardizedQuality.setCompanyName(sysCompany.getName()); standardizedQuality.setCreateBy(loginUser.getUsername()); standardizedQuality.setCreateTime(LocalDateTime.now()); @@ -121,7 +126,7 @@ @Override public CommonResult updateStandardizedQuality(StandardizedQuality standardizedQuality) { LoginUserDetails loginUser = SecurityUtils.getLoginUser(); - SysCompany sysCompany = sysCompanyService.selectCompanyById(SecurityUtils.getCompanyId()); + SysCompany sysCompany = sysCompanyService.selectCompanyById(standardizedQuality.getCompanyId().longValue()); standardizedQuality.setCompanyName(sysCompany.getName()); standardizedQuality.setUpdateBy(loginUser.getUsername()); standardizedQuality.setUpdateTime(LocalDateTime.now()); -- Gitblit v1.9.2