Просмотр исходного кода

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

anderx лет назад: 5
Родитель
Сommit
4df2044461
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      src/main/java/com/goafanti/common/task/ReleaseUserTask.java

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

@@ -61,10 +61,10 @@ public class ReleaseUserTask {
 					if(StringUtils.isNotBlank(u.getId())) {
 						userTmpList = customerServiceImpl.selectWaitReleaseCustomer(u.getId());
 //						userTmpList = customerServiceImpl.selectWaitReleaseCustomer("1");
-							if(!userTmpList.isEmpty())lockUserList.addAll(userTmpList);
+							if(userTmpList!=null&&!userTmpList.isEmpty())lockUserList.addAll(userTmpList);
 							businessTmpList = customerServiceImpl.selectWaitReleaseBusiness(u.getId());
 //						businessTmpList = customerServiceImpl.selectWaitReleaseBusiness("1");
-							if(!businessTmpList.isEmpty())lockBusinessList.addAll(businessTmpList);
+							if(businessTmpList!=null&&!businessTmpList.isEmpty())lockBusinessList.addAll(businessTmpList);
 						}
 				}