Explorar el Código

Merge branch 'master' into test

anderx hace 4 años
padre
commit
25e09da57e
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  1. 2 2
      src/main/java/com/goafanti/common/task/ReleaseUserTask.java

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

@@ -123,8 +123,8 @@ public class ReleaseUserTask {
 			List<LockingReleaseBo> lockUserList = new ArrayList<LockingReleaseBo>();
 			if (userList != null && !userList.isEmpty()) {
 				for (User u : userList) {
-					List<LockingReleaseBo> userTmpList = null;
-					List<LockingReleaseBo> userTmpList2 = null;
+					List<LockingReleaseBo> userTmpList = new ArrayList<LockingReleaseBo>();
+					List<LockingReleaseBo> userTmpList2 = new ArrayList<LockingReleaseBo>();
 					if (StringUtils.isNotBlank(u.getId())) {
 						// 获取30天释放
 						userTmpList = customerService.selectWaitReleaseCustomer(u.getId(), 0);