Merge remote-tracking branch 'origin/master'

whepi-web/src/main/java/com/bofeng/service/HomeService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.toolkit.IdWorker;
 import com.bofeng.dao.UserOpenMapper;
 import com.bofeng.entity.ParseCurrentOpenId;
 import com.bofeng.entity.UserOpen;
+import com.google.common.base.Strings;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +25,13 @@ public class HomeService {
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public UserOpen getUserOpen() {
         ParseCurrentOpenId wxToken = userService.currentWxUser();
+        if (wxToken == null) {
+            return null;
+        }
         WxMpUser wxMpUser = wxToken.getWxMpUser();
+        if (wxMpUser == null || Strings.isNullOrEmpty(wxMpUser.getOpenId())) {
+            return null;
+        }
         UserOpen user = userOpenMapper.selectByOpenId(wxMpUser.getOpenId());
         if (user == null && !wxMpUser.getOpenId().equals("")) {
             // 账户没有注册,需要注册

whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

@@ -66,6 +66,9 @@ public class UserOpenController {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
             UserOpen userOpen = homeService.getUserOpen();
+            if (userOpen == null) {
+                return null;
+            }
             list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
 //            list = userRoleMapper.getUserRoleByUserId(1234L);
 //            UserOpen userOpen = userOpenMapper.selectByUserId(1234L);