s

notes-job/src/main/java/com/zjty/tynotes/job/status/service/impl/TestServiceImpl.java

@@ -78,6 +78,8 @@ public class TestServiceImpl implements TestService {
 
             }else {
                 uIds = tests(work.getSuperiorId(), uIds);
+                uIds.remove(work.getPublisher());
+                uIds.remove(work.getExecutor());
                 personalWork.setWorkAttribution(WorkAttribution1.ME_RESOLVE_WORK);
                 personalWork.setExecutorEqualRelease(1);
                 personalWork.setReadState(0);
@@ -107,6 +109,8 @@ public class TestServiceImpl implements TestService {
 
             } else {
                 uIds = tests(work.getSuperiorId(), uIds);
+                uIds.remove(work.getPublisher());
+                uIds.remove(work.getExecutor());
                 personalWork.setWorkAttribution(WorkAttribution1.ME_RESOLVE_WORK);
                 personalWork.setReadState(0);
                 redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), personalWork);
@@ -220,6 +224,8 @@ public class TestServiceImpl implements TestService {
         List<String> uIds=new ArrayList<>();
         if (work.getSuperiorId()!=null) {
             uIds = tests(work.getSuperiorId(), uIds);
+            uIds.remove(work.getPublisher());
+            uIds.remove(work.getExecutor());
         }
         String releaseName= iUserService.findUserById(work.getPublisher()).getUsername();
         String executorName= iUserService.findUserById(work.getExecutor()).getUsername();
@@ -293,8 +299,9 @@ public class TestServiceImpl implements TestService {
         Long time=new Date().getTime();
         if (work.getSuperiorId()!=null) {
             uIds = tests(work.getSuperiorId(), uIds);
+            uIds.remove(work.getPublisher());
+            uIds.remove(work.getExecutor());
         }
-
         if (work.getExecutor().equals(work.getPublisher())){
             List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1);
             for (Object object : list) {
@@ -322,7 +329,6 @@ public class TestServiceImpl implements TestService {
                             redisPersonalWork.setIsNotCommission(0);
                             break;
                     }
-
                     redisPersonalWork.setLatestNews(latestNews);
                     redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), redisPersonalWork);
                     asynchronousAddEs(Constants.REDIS_EVENT + work.getPublisher(), redisPersonalWork);
@@ -428,6 +434,8 @@ public class TestServiceImpl implements TestService {
         List<String> uIds=new ArrayList<>();
         if (work.getSuperiorId()!=null) {
             uIds = tests(work.getSuperiorId(), uIds);
+            uIds.remove(work.getPublisher());
+            uIds.remove(work.getExecutor());
         }
         Long time=new Date().getTime();
         if (work.getExecutor().equals(work.getPublisher())){
@@ -505,6 +513,8 @@ public class TestServiceImpl implements TestService {
         List<String> uIds=new ArrayList<>();
         if (work.getSuperiorId()!=null) {
             uIds = tests(work.getSuperiorId(), uIds);
+            uIds.remove(work.getPublisher());
+            uIds.remove(work.getExecutor());
         }
         Long time=new Date().getTime();
         if (work.getExecutor().equals(work.getPublisher())){