From 3ca43826a747fda1447b2501901f84fc1a9019dd Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期四, 07 十一月 2024 16:39:45 +0800
Subject: [PATCH] 修改验证及编码逻辑处理修改
---
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanServiceImpl.java | 51 +++++++++++++------------
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskUnitServiceImpl.java | 4 +-
src/main/java/com/gkhy/labRiskManage/application/riskReport/service/impl/RiskAccessAppServiceImpl.java | 51 +++++++++++++------------
src/main/java/com/gkhy/labRiskManage/domain/riskReport/repository/jpa/RiskUnitRepository.java | 4 +-
4 files changed, 58 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/gkhy/labRiskManage/application/riskReport/service/impl/RiskAccessAppServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/application/riskReport/service/impl/RiskAccessAppServiceImpl.java
index 80506bf..f5ceb5b 100644
--- a/src/main/java/com/gkhy/labRiskManage/application/riskReport/service/impl/RiskAccessAppServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/application/riskReport/service/impl/RiskAccessAppServiceImpl.java
@@ -607,14 +607,15 @@
}
int roleTag = 0;
UserInfoDomainDTO user = userDomainService.getUserById(currentUserId);
- for (SysUserRoleBindDomainDTO role : user.getRoles()) {
- if (role.getRoleId() == UserRoleEnum.USER_ROLE_4.getCode().byteValue()){
- roleTag = 1;
- }
- }
- if (roleTag != 1){
- throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode(), "当前用户不是管理人员，无权限添加");
- }
+// for (SysUserRoleBindDomainDTO role : user.getRoles()) {
+// if (role.getRoleId() == UserRoleEnum.USER_ROLE_4.getCode().byteValue()){
+// roleTag = 1;
+// }
+// }
+ //20241107修改注释权限
+// if (roleTag != 1){
+// throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode(), "当前用户不是管理人员，无权限添加");
+// }
if (ObjectUtils.isEmpty(riskUnitInsertReqBO.getExperimentId())){
throw new BusinessException(this.getClass(), ResultCode.PARAM_ERROR_NULL.getCode(), "所选实验不能为空");
}
@@ -715,14 +716,15 @@
}
int roleTag = 0;
UserInfoDomainDTO user = userDomainService.getUserById(currentUserId);
- for (SysUserRoleBindDomainDTO role : user.getRoles()) {
- if (role.getRoleId() == UserRoleEnum.USER_ROLE_4.getCode().byteValue()){
- roleTag = 1;
- }
- }
- if (roleTag != 1){
- throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode(), "当前用户不是管理人员，无权限修改");
- }
+// for (SysUserRoleBindDomainDTO role : user.getRoles()) {
+// if (role.getRoleId() == UserRoleEnum.USER_ROLE_4.getCode().byteValue()){
+// roleTag = 1;
+// }
+// }
+ //20241107修改注释权限
+// if (roleTag != 1){
+// throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode(), "当前用户不是管理人员，无权限修改");
+// }
if (ObjectUtils.isEmpty(updateReqBO.getExperimentId())){
throw new BusinessException(this.getClass(), ResultCode.PARAM_ERROR_NULL.getCode(), "所选实验不能为空，或实验已被删除");
}
@@ -764,14 +766,15 @@
}
int roleTag = 0;
UserInfoDomainDTO user = userDomainService.getUserById(currentUserId);
- for (SysUserRoleBindDomainDTO role : user.getRoles()) {
- if (role.getRoleId() == UserRoleEnum.USER_ROLE_4.getCode().byteValue()){
- roleTag = 1;
- }
- }
- if (roleTag != 1){
- throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode(), "当前用户不是管理人员，无权限添加");
- }
+ //20241107注释
+// for (SysUserRoleBindDomainDTO role : user.getRoles()) {
+// if (role.getRoleId() == UserRoleEnum.USER_ROLE_4.getCode().byteValue()){
+// roleTag = 1;
+// }
+// }
+// if (roleTag != 1){
+// throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode(), "当前用户不是管理人员，无权限添加");
+// }
RiskUnitDeleteDTO deleteResult = riskUnitService.deleteRiskUnit(currentUserId, id);
if (ObjectUtils.isEmpty(deleteResult)){
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/repository/jpa/RiskUnitRepository.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/repository/jpa/RiskUnitRepository.java
index 42623fd..578ede8 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/repository/jpa/RiskUnitRepository.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/repository/jpa/RiskUnitRepository.java
@@ -19,8 +19,8 @@
/**
* 实验风险单元 - 查询 by code
*/
- @Query(value = "select t from RiskUnit t where t.riskCode = :riskCode and t.deleteStatus = 0")
- RiskUnit getUnitByCode(String riskCode);
+ @Query(value = "select t from RiskUnit t where t.riskCode = :riskCode and t.experimentId = :experimentId and t.deleteStatus = 0")
+ RiskUnit getUnitByCode(String riskCode,Long experimentId);
/**
* 风险单元 - 查询 by id
*/
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanServiceImpl.java
index 5791ded..ad49b92 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanServiceImpl.java
@@ -100,14 +100,15 @@
// 检查是否是实验管理者
int roleTag = 0;
UserInfoDomainDTO user = userDomainService.getUserById(currentUserId);
- for (SysUserRoleBindDomainDTO role : user.getRoles()) {
- if (role.getRoleId() == UserRoleEnum.USER_ROLE_4.getCode().byteValue()){
- roleTag = 1;
- }
- }
- if (roleTag ==0 ){
- throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"当前用户无权添加实验评估计划");
- }
+ //20241107修改注释
+// for (SysUserRoleBindDomainDTO role : user.getRoles()) {
+// if (role.getRoleId() == UserRoleEnum.USER_ROLE_4.getCode().byteValue()){
+// roleTag = 1;
+// }
+// }
+// if (roleTag ==0 ){
+// throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"当前用户无权添加实验评估计划");
+// }
if (ObjectUtils.isEmpty(user)){
throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"当前用户不存在或已被删除");
}
@@ -364,14 +365,15 @@
// 检查是否是实验管理者
int roleTag = 0;
UserInfoDomainDTO user = userDomainService.getUserById(currentUserId);
- for (SysUserRoleBindDomainDTO role : user.getRoles()) {
- if (role.getRoleId() == UserRoleEnum.USER_ROLE_4.getCode().byteValue()){
- roleTag = 1;
- }
- }
- if (roleTag ==0 ){
- throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"当前用户无权修改实验评估计划");
- }
+ //20241107修改注释
+// for (SysUserRoleBindDomainDTO role : user.getRoles()) {
+// if (role.getRoleId() == UserRoleEnum.USER_ROLE_4.getCode().byteValue()){
+// roleTag = 1;
+// }
+// }
+// if (roleTag ==0 ){
+// throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"当前用户无权修改实验评估计划");
+// }
//参数校验
if (ObjectUtils.isEmpty(updateParam)){
throw new BusinessException(this.getClass(), ResultCode.PARAM_ERROR_NULL.getCode(), "要求改的参数为空");
@@ -473,14 +475,15 @@
// 检查是否是实验管理者
int roleTag = 0;
UserInfoDomainDTO user = userDomainService.getUserById(currentUserId);
- for (SysUserRoleBindDomainDTO role : user.getRoles()) {
- if (role.getRoleId() == UserRoleEnum.USER_ROLE_4.getCode().byteValue()){
- roleTag = 1;
- }
- }
- if (roleTag ==0 ){
- throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"当前用户无权删除实验评估计划");
- }
+ //20241107注释
+// for (SysUserRoleBindDomainDTO role : user.getRoles()) {
+// if (role.getRoleId() == UserRoleEnum.USER_ROLE_4.getCode().byteValue()){
+// roleTag = 1;
+// }
+// }
+// if (roleTag ==0 ){
+// throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"当前用户无权删除实验评估计划");
+// }
UserInfoDomainDTO userInfoById = userDomainService.getUserInfoById(currentUserId);
if (ObjectUtils.isEmpty(userInfoById)){
throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"当前用户不存在或已被删除");
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskUnitServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskUnitServiceImpl.java
index baad6bb..4c41b22 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskUnitServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskUnitServiceImpl.java
@@ -85,7 +85,7 @@
if (ObjectUtils.isEmpty(insertParam.getRiskCode())){
throw new BusinessException(this.getClass(), ResultCode.PARAM_ERROR_NULL.getCode(), "风险单元编号不能为空");
}
- RiskUnit unitByCode = riskUnitRepository.getUnitByCode(insertParam.getRiskCode());
+ RiskUnit unitByCode = riskUnitRepository.getUnitByCode(insertParam.getRiskCode(), insertParam.getExperimentId());
if (!ObjectUtils.isEmpty(unitByCode)){
throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode(), "编号已被使用");
}
@@ -279,7 +279,7 @@
if (ObjectUtils.isEmpty(updateParam.getRiskCode())){
throw new BusinessException(this.getClass(), ResultCode.PARAM_ERROR_NULL.getCode(), "风险单元编号不能为空");
}
- RiskUnit unitByCode = riskUnitRepository.getUnitByCode(updateParam.getRiskCode());
+ RiskUnit unitByCode = riskUnitRepository.getUnitByCode(updateParam.getRiskCode(),updateParam.getExperimentId());
if (!ObjectUtils.isEmpty(unitByCode) && !updateParam.getId().equals(unitByCode.getId())){
throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode(), "编号已被使用");
}
--
Gitblit v1.9.2