Merge remote-tracking branch 'origin/master'

src/main/java/com/yx/face/service/impl/UserInfoServiceImpl.java

@@ -218,8 +218,8 @@ public class UserInfoServiceImpl implements UserInfoService {
         UserBlackList userBlackList = new UserBlackList();
         userBlackList.setPhone(userInfo.getPhone());
         userBlackList.setAdminId(Integer.valueOf(admin));
-        UserBlackList userBlackOne = userBlackListDao.selectOne(userBlackList);
-        if (userBlackOne != null) {
+        List<UserBlackList> select = userBlackListDao.select(userBlackList);
+        if (!select.isEmpty()) {
             throw new ServiceException("禁止下发哦~");
         }
         //常客