Dlp-Gyjd/dlp-entrustment
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提供自动认领的功能

Browse Source
This commit is contained in:
杨海航
2025-02-19 17:57:37 +08:00
parent 4acb10b72d
commit 24127de396
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
View File

@@ -527,8 +527,8 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
// throw new RuntimeException(String.format("委托的审核任务是由其他人认领的。认领用户是: %s", uName));
// }
if (!dlpUser.getId().equals(entrustment.getCheckCandidateUser())) {
throw new RuntimeException(String.format("你不在可以审核的用户列表中!"));
if (!entrustment.getCheckCandidateUser().contains(dlpUser.getId())) {
throw new RuntimeException("你不在可以审核的用户列表当中!");
}
//-------------------

6
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
View File

@@ -1471,7 +1471,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
}
// 这里修改一下，我们要去掉委托认领的功能，所以只要用户是在审核列表中的，就可以进行审核操作
if (!dlpUser.getId().equals(entrustment.getCheckCandidateUser())) {
if (!entrustment.getCheckCandidateUser().contains(dlpUser.getId())) {
throw new RuntimeException("你不在可以审核的用户列表当中!");
}
// if (!dlpUser.getId().equals(entrustment.getCheckClaimUser())) {
@@ -1721,8 +1721,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", entrust.getId()));
}
if (!dlpUser.getId().equals(entrustment.getCheckCandidateUser())) {
throw new RuntimeException("你不在可以进行审批的用户列表中!");
if (!entrustment.getCheckCandidateUser().contains(dlpUser.getId())) {
throw new RuntimeException("你不在可以审批的用户列表当中!");
}
// if (!dlpUser.getId().equals(entrustment.getApproveClaimUser())) {
// throw new RuntimeException(String.format("委托的审批任务是由其他人认领的。认领用户是: %s", entrustment.getCheckClaimUser()));