From b26fa74ee36259650c61cc9387f166c199c39783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 18 Jul 2023 19:18:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ParamsInfoEOController.java | 21 ++++++++++--------- .../IProjectRelatedPersonnelService.java | 2 ++ ...ctCertificationDirectoryEOServiceImpl.java | 16 ++++++++++++++ .../ProjectRelatedPersonnelServiceImpl.java | 13 ++++++++++++ jero-web/src/common/lang/en-us.js | 3 +++ jero-web/src/common/lang/zh-cn.js | 3 +++ jero-web/src/components/tools/UserMenu.vue | 9 +++++--- 7 files changed, 54 insertions(+), 13 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index 460fef68c..47803ba90 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -94,20 +94,21 @@ public class ParamsInfoEOController extends JeroControllerwrapper.eq("pi.nio_number", finalAllNumber)); - +// queryWrapper.and(wrapper->wrapper.eq("pi.nio_number", finalAllNumber)); QueryWrapper categoryParamsQueryWrap = new QueryWrapper<>(); categoryParamsQueryWrap.lambda().eq(CertCategoryParamsInfoEO::getParamsNumber,finalAllNumber); List certCategoryParamsInfoEOList = this.certCategoryParamsInfoEOService.list(categoryParamsQueryWrap); - - if(CollectionUtils.isNotEmpty(certCategoryParamsInfoEOList)){ - List nioNumberList = certCategoryParamsInfoEOList.stream().map(CertCategoryParamsInfoEO::getNioNumber).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(nioNumberList)){ - queryWrapper.or(wrap -> { - wrap.in("pi.nio_number",nioNumberList); - }); + queryWrapper.and(wrapper->{ + wrapper.eq("pi.nio_number", finalAllNumber); + if(CollectionUtils.isNotEmpty(certCategoryParamsInfoEOList)){ + List nioNumberList = certCategoryParamsInfoEOList.stream().map(CertCategoryParamsInfoEO::getNioNumber).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(nioNumberList)){ + wrapper.or(wrap -> { + wrap.in("pi.nio_number",nioNumberList); + }); + } } - } + }); } queryWrapper.like(StringUtils.isNotEmpty(paramsInfoEO.getParamsName()), "pi.params_name", paramsInfoEO.getParamsName()) .eq(StringUtils.isNotEmpty(paramsInfoEO.getDutyTerritory()), "pi.duty_territory", paramsInfoEO.getDutyTerritory()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index 6e9f292bc..2fb0ac966 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -107,6 +107,8 @@ public interface IProjectRelatedPersonnelService extends IService> queryEngineeringInterfacePersonByProjectId(Map params); + List queryLawEngineerByProjectId(String projectLibraryId); + /** * 获取用户的责任领域数组 * @param params diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java index 515c52d2c..22866b12f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java @@ -16,12 +16,18 @@ import com.jero.modules.project.mapper.ProjectCertificationDirectoryEOMapper; import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.service.IProjectCertificationDirectoryEOService; +import com.jero.modules.project.service.IProjectRelatedPersonnelService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.HashMap; import java.util.List; import java.util.Date; +import java.util.Map; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.servlet.http.HttpServletRequest; @@ -41,6 +47,10 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl resList = projectRelatedPersonnelService.queryLawEngineerByProjectId(projectLibraryId); + if (CollectionUtils.isNotEmpty(resList) && resList.contains(currentUser.getId())) { + result = Integer.parseInt(ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + return result; + } }catch (Exception ex){ log.error("验证用户在该项目中的角色失败：" + ex.getMessage()); throw new JeroBootException("验证用户在该项目中的角色失败！"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 8dd5563f2..ffd430a07 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -1855,6 +1855,19 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl queryLawEngineerByProjectId(String projectLibraryId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + List prpEoList = this.list(queryWrapper.eq("project_id", projectLibraryId)); + if (CollectionUtils.isNotEmpty(prpEoList)) { + String lawEngineerIds = prpEoList.stream().filter(e -> StringUtils.isNotEmpty(e.getLawEngineer())) + .map(ProjectRelatedPersonnel::getLawEngineer).collect(Collectors.joining(",")); + List lawEngineerList = Arrays.asList(lawEngineerIds.split(",")); + return lawEngineerList; + } + return null; + } + @Override public List> queryEngineeringInterfacePersonByProjectId(Map params) { List> resultList = new ArrayList<>(); diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 621f1567f..55a00b8ef 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1909,4 +1909,7 @@ module.exports = { replacedPerson:'Replaced person', replacementPerson:'Replacement Person', thereReplaceableData:'There is currently no replaceable data', + logOutOfLogin:'Logout', + tips:'Alert', + areYouLogout:'Are you sure to logout', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 06aae760c..395af8e55 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3865,4 +3865,7 @@ module.exports = { replacedPerson:'被替换人', replacementPerson:'替换人', thereReplaceableData:'当前没有可替换的数据', + logOutOfLogin:'退出登录', + tips:'提示', + areYouLogout:'确认退出登录吗', } \ No newline at end of file diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue index a26d99cf9..e91d94eb6 100644 --- a/jero-web/src/components/tools/UserMenu.vue +++ b/jero-web/src/components/tools/UserMenu.vue @@ -102,7 +102,7 @@ - 退出登录 + {{$t('logOutOfLogin')}}