Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/home.ftl

@@ -1,7 +1,7 @@
 <#assign title="我的家"/>
 <#include "/home/frag.head.ftl" />
 
-<input class="weui-tab">
+<div class="weui-tab">
     <input id="userId" type="text" hidden="hidden" value=${user_id!}/>
     <div class="weui-tab__bd">
         <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">

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

@@ -46,10 +46,10 @@ public class UserOpenController {
     public ModelAndView home(ModelMap model, @RequestParam(value = "userId", required = false,defaultValue = "0") Long userId) {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
-//            UserOpen userOpen = homeService.getUserOpen();
-//            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-            list = userRoleMapper.getUserRoleByUserId(1224239062748065800L);
-            UserOpen userOpen = userOpenMapper.selectByUserId(1224239062748065800L);
+            UserOpen userOpen = homeService.getUserOpen();
+            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//            list = userRoleMapper.getUserRoleByUserId(1224239062748065800L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(1224239062748065800L);
             model.put("user", userOpen);
             model.put("user_id", "\""+userOpen.getUserId()+"\"");
         } else {