Parcourir la source

Merge remote-tracking branch 'origin/test' into dev

anderx il y a 5 ans
Parent
commit
21ffc4079e
1 fichiers modifiés avec 6 ajouts et 6 suppressions
  1. 6 6
      src/main/java/com/goafanti/common/task/ReleaseUserTask.java

+ 6 - 6
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -60,12 +60,12 @@ public class ReleaseUserTask {
 				for(User u : userList){
 					if(StringUtils.isNotBlank(u.getId())) {
 						userTmpList = customerServiceImpl.selectWaitReleaseCustomer(u.getId());
-//					userTmpList = customerServiceImpl.selectWaitReleaseCustomer("1");
-						lockUserList.addAll(userTmpList);
-						businessTmpList = customerServiceImpl.selectWaitReleaseBusiness(u.getId());
-//					businessTmpList = customerServiceImpl.selectWaitReleaseBusiness("1");
-						lockBusinessList.addAll(businessTmpList);
-					}
+//						userTmpList = customerServiceImpl.selectWaitReleaseCustomer("1");
+							if(!userTmpList.isEmpty())lockUserList.addAll(userTmpList);
+							businessTmpList = customerServiceImpl.selectWaitReleaseBusiness(u.getId());
+//						businessTmpList = customerServiceImpl.selectWaitReleaseBusiness("1");
+							if(!businessTmpList.isEmpty())lockBusinessList.addAll(businessTmpList);
+						}
 				}
 				
 			}