角色debug

pmapi/src/main/java/com/ningdatech/pmapi/datascope/provider/impl/OrdinaryUserDataScopeProviderImpl.java

@@ -22,7 +22,7 @@ import java.util.Optional;
  */
 @Slf4j
 @RequiredArgsConstructor
-@Component("ORDINARY_USER")
+@Component("NORMAL_MEMBER")
 public class OrdinaryUserDataScopeProviderImpl implements DataScopeProvider {
 
     private final UserInfoHelper userInfoHelper;

pmapi/src/main/java/com/ningdatech/pmapi/datascope/provider/impl/OrgAdminDataScopeProviderImpl.java

@@ -21,7 +21,7 @@ import java.util.Optional;
  */
 @Slf4j
 @RequiredArgsConstructor
-@Component("ORG_ADMIN")
+@Component("COMPANY_MANAGER")
 public class OrgAdminDataScopeProviderImpl implements DataScopeProvider {
 
     private final UserInfoHelper userInfoHelper;

pmapi/src/main/java/com/ningdatech/pmapi/datascope/provider/impl/RegionAdminDataScopeProviderImpl.java

@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @RequiredArgsConstructor
-@Component("REGION_ADMIN")
+@Component("REGION_MANAGER")
 public class RegionAdminDataScopeProviderImpl implements DataScopeProvider {
 
     private final RegionCacheHelper regionCacheHelper;

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

@@ -505,16 +505,32 @@ public class TodoCenterManage {
 
         UserFullInfoDTO beforeUser  = null;
         Boolean isAndOr = Boolean.FALSE;
-        //还有种情况是 会签 或签 并且在上个节点
-        if(CollUtil.isNotEmpty(beforeAndOr)){
-            for(ProgressNode n : beforeAndOr){
-                if(n.getUserId().equals(user.getEmployeeCode())){
+
+        //如果上个会签没取到 还有种情况是 会签 或签 并且在上个节点
+        if(CollUtil.isNotEmpty(beforeAndOr)) {
+            for (ProgressNode n : beforeAndOr) {
+                if (n.getUserId().equals(user.getEmployeeCode())) {
+                    beforeProgressNode = n;
                     //说明当前操作人 在上个会签或者或签节点
                     isAndOr = Boolean.TRUE;
                     break;
                 }
             }
         }
+
+        //还有种情况是 会签 或签 并且在当前节点 并且已经通过
+        if(!isAndOr && CollUtil.isNotEmpty(thisAndOr)){
+            for(ProgressNode n : thisAndOr){
+                if(n.getUserId().equals(user.getEmployeeCode()) &&
+                Objects.nonNull(n.getFinishTime())){
+                    beforeProgressNode = n;
+                    //说明当前操作人 在上个会签或者或签节点
+                    isAndOr = Boolean.TRUE;
+                    break;
+                }
+            }
+        }
+
         if(Objects.nonNull(beforeProgressNode)){
             // 获取当前工作流任务前一个审核人信息
             beforeUser = userInfoHelper.getUserFullInfoByEmployeeCode(beforeProgressNode.getUserId());