未选中二级部门报错

whepi-ui/templates/user/home.ftl

@@ -690,7 +690,7 @@
                     // $("#first").hide();
                     // $("#second").show();
 
-                    $.alert("当前手机号码无法认证，请重新输入正确的手机号码！");
+                    $.alert("当前手机号码无法认证，请重新输入正确的手机号码！ 如果您还没有注册，请到《平台简介》菜单下面，用‘用户注册’功能注册账号！");
                     return false;
 
                 }else{

whepi-web/src/main/java/com/bofeng/wx/WxController.java

@@ -174,6 +174,17 @@ public class WxController {
 
         btnDesc.getSubButtons().add(btn31);
 
+        val btn32 = new WxMenuButton();
+        btn32.setName("用户注册");
+        btn32.setType(WxConsts.MenuButtonType.VIEW);
+        btn32.setUrl(
+                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
+                                "/user/register.html",
+                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
+        );
+
+        btnDesc.getSubButtons().add(btn32);
+
 //        btn3.getSubButtons().add(btnDesc);
 //        btn3.getSubButtons().add(btnHelp);
 

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

@@ -153,6 +153,98 @@ public class UserOpenController {
     }
 
 
+
+    @GetMapping("/user/register.html")
+    public ModelAndView register(ModelMap model, @RequestParam(value = "userId", required = false, defaultValue = "0") Long userId,
+                             @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
+        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(1228565481837944834L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(1228565481837944834L);
+            userId = userOpen.getUserId();
+            model.put("user", userOpen);
+            model.put("user_id", "\"" + userOpen.getUserId() + "\"");
+            List<Uptown> uptowns = rbMapper.selectUptown(userId);
+            if (uptowns != null && uptowns.size() > 0) {
+                Long uptown_id = uptowns.get(0).getUptownId();
+                String uptown_name = uptowns.get(0).getUptownName();
+                model.put("uptown_id", "\"" + uptown_id + "\"");
+                model.put("uptownId", uptown_id);
+                model.put("uptown_name", uptown_name);
+                // 凌云集团的可以更改unit
+                if (uptown_id == 1238790987234L || uptown_id == 5L || uptown_id == 100000002L) {
+                    UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userId);
+                    model.put("ridgepole", unit.getRidgepole());
+                    model.put("unit", unit.getUnit());
+                    model.put("unitId", unit.getUnitId());
+                    model.put("doorplate", unit.getDoorplate());
+                    model.put("departmentId", unit.getDepartmentId());
+                    model.put("departmentName", unit.getDepartmentName());
+                    List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
+                    model.put("linkman", uptownHomes.get(0).getLinkman());
+                }
+            }
+
+
+            if (list.size() == 0) {
+                return new ModelAndView("/user/register.ftl", model);
+            }
+            if (list.size() == 1) {
+                //今天数据，今天没有，复制最近一天的数据
+                MsReport msReport = msReportService.getReportByDateNow(userId);
+                model.put("msReport", new JsonWapper(msReport));
+                return new ModelAndView("/home/home.ftl", model);
+            }
+            if (list.size() == 2) {
+                //今天数据，今天没有，复制最近一天的数据
+                MsReport msReport = msReportService.getReportByDateNow(userId);
+                model.put("msReport", new JsonWapper(msReport));
+                model.put("type", 1);
+                return new ModelAndView("/user/changeRole.ftl", model);
+            }
+        } else {
+            model.put("user", userOpenMapper.selectByUserId(userId));
+            model.put("user_id", "\"" + userId + "\"");
+            List<Uptown> uptowns = rbMapper.selectUptown(userId);
+            if (uptowns != null && uptowns.size() > 0) {
+                Long uptown_id = uptowns.get(0).getUptownId();
+                String uptown_name = uptowns.get(0).getUptownName();
+                model.put("uptown_id", "\"" + uptown_id + "\"");
+                model.put("uptownId", uptown_id);
+                model.put("uptown_name", uptown_name);
+                // 凌云集团的可以更改unit
+                if (uptown_id == 1238790987234L || uptown_id == 5L || uptown_id == 100000002L) {
+                    UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userId);
+                    model.put("ridgepole", unit.getRidgepole());
+                    model.put("unit", unit.getUnit());
+                    model.put("unitId", unit.getUnitId());
+                    model.put("doorplate", unit.getDoorplate());
+                    model.put("departmentId", unit.getDepartmentId());
+                    model.put("departmentName", unit.getDepartmentName());
+                    List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userId);
+                    model.put("linkman", uptownHomes.get(0).getLinkman());
+                }
+            }
+            if (userType == 1) {
+                MsReport msReport = msReportService.getReportByDateNow(userId);
+                model.put("msReport", new JsonWapper(msReport));
+                return new ModelAndView("/home/home.ftl", model);
+            } else if (userType == 2) {
+                model.put("type", 1);
+                return new ModelAndView("/user/changeRole.ftl", model);
+            }
+        }
+        return null;
+    }
+
+
+
+
     @ApiOperation("商品团购")
     @ApiImplicitParams({@ApiImplicitParam(name = "userId", value = "用户ID", required = false, dataType = "Long", paramType = "query"),
             @ApiImplicitParam(name = "userType", value = "用户类型", required = false, dataType = "Integer", paramType = "query")