peiguo 5 年 前
コミット
e0bfaf71e5

+ 16 - 16
whepi-ui/templates/user/home.ftl

@@ -18,11 +18,11 @@
                     <br/>
                     <br/>
                     <div class="weui-form" id="fromMsg">
-                        <div class="weui-cells_radio user-font">
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;我是&nbsp;&nbsp;
-                            <input name="Fruit" type="radio" value="1"/>家庭用户
-                            <input name="Fruit" type="radio" value="2"/>业委会人员
-                        </div>
+<#--                        <div class="weui-cells_radio user-font">-->
+<#--                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;我是&nbsp;&nbsp;-->
+<#--                            <input name="Fruit" type="radio" value="1"/>家庭用户-->
+<#--                            <input name="Fruit" type="radio" value="2"/>业委会人员-->
+<#--                        </div>-->
                         <hr class="user-hr">
                         <div class="maindiv">
                             <div class="leftdiv">
@@ -295,7 +295,7 @@
                         type: "post",
                         data: {
                             "userId": userId,
-                            "userType": $('input:radio:checked').val(),
+                            // "userType": $('input:radio:checked').val(),
                             "linkman": $("#linkman").val(),
                             "phone": $("#phone").val(),
                             "city": city,
@@ -304,7 +304,7 @@
                             "uptownId": uptownId,
                             "doorplate": doorplate,
                         },success: function (date) {
-                            window.location.href = "/user/home.html?userId=" + userId + "&userType=" + $('input:radio:checked').val();
+                            window.location.href = "/user/home.html?userId=" + userId + "&userType=1";
                         }
                     });
                 }
@@ -313,14 +313,14 @@
     }
 
     function goOn() {
-        var userType = $('input:radio:checked').val();
-        if (!userType) {
-            $("#tpl_msg_warn_userType").show();
-            $("#tpl_msg_warn_linkman").hide();
-            $("#tpl_msg_warn_phone").hide();
-            $("#fromMsg").hide();
-            return false;
-        }
+        // var userType = $('input:radio:checked').val();
+        // if (!userType) {
+        //     $("#tpl_msg_warn_userType").show();
+        //     $("#tpl_msg_warn_linkman").hide();
+        //     $("#tpl_msg_warn_phone").hide();
+        //     $("#fromMsg").hide();
+        //     return false;
+        // }
         var linkman = $("#linkman").val();
         if (!linkman) {
             $("#tpl_msg_warn_userType").hide();
@@ -342,7 +342,7 @@
         $("#tpl_msg_warn_phone").hide();
         $("#first").hide();
         $("#second").show();
-        console.log(userType)
+        // console.log(userType)
         console.log(linkman)
         console.log(phone)
     }

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

@@ -60,10 +60,10 @@ public class UserOpenController {
                              @RequestParam(value = "userType", required = false,defaultValue = "0") Integer userType) throws JsonProcessingException {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
-//            UserOpen userOpen = homeService.getUserOpen();
-//            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-            list = userRoleMapper.getUserRoleByUserId(1225325493987995649L);
-            UserOpen userOpen = userOpenMapper.selectByUserId(1225325493987995649L);
+            UserOpen userOpen = homeService.getUserOpen();
+            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//            list = userRoleMapper.getUserRoleByUserId(13131L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(13131L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\""+userOpen.getUserId()+"\"");
@@ -141,14 +141,14 @@ public class UserOpenController {
     @PostMapping("/home/saveUser.json")
     public void saveUser(ModelMap model, HttpServletRequest request) {
         Long userId = Long.parseLong(request.getParameter("userId"));
-        Integer userType = Integer.parseInt(request.getParameter("userType"));
+//        Integer userType = Integer.parseInt(request.getParameter("userType"));
         String linkman = request.getParameter("linkman");
         String phone = request.getParameter("phone");
         Integer area = Integer.parseInt(request.getParameter("area"));
         Long uptownId = Long.parseLong(request.getParameter("uptownId"));
         Long unitId = Long.parseLong(request.getParameter("unitId"));
         String doorplate = request.getParameter("doorplate");
-        userOpenService.saveUserInfo(userId,userType,linkman,phone,area,uptownId,unitId,doorplate);
+        userOpenService.saveUserInfo(userId,1,linkman,phone,area,uptownId,unitId,doorplate);
     }
 
     @ApiOperation("客户档案信息错误数据导出")