修改客户端提示

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

@@ -71,13 +71,13 @@ 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();
-//            if (userOpen == null) {
-//                return null;
-//            }
-//            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-            list = userRoleMapper.getUserRoleByUserId(1226354442290638849L);// 1226354442290638849L廖丹
-            UserOpen userOpen = userOpenMapper.selectByUserId(1226354442290638849L);
+            UserOpen userOpen = homeService.getUserOpen();
+            if (userOpen == null) {
+                return null;
+            }
+            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//            list = userRoleMapper.getUserRoleByUserId(1226354442290638849L);// 1226354442290638849L廖丹
+//            UserOpen userOpen = userOpenMapper.selectByUserId(1226354442290638849L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\"" + userOpen.getUserId() + "\"");
@@ -99,7 +99,7 @@ public class UserOpenController {
                     model.put("doorplate", unit.getDoorplate());
                     model.put("departmentId", unit.getDepartmentId());
                     model.put("departmentName", unit.getDepartmentName());
-                    List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
+                    List<UptownHome> uptownHomes = uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
                     model.put("linkman", uptownHomes.get(0).getLinkman());
                 }
             }
@@ -139,7 +139,7 @@ public class UserOpenController {
                     model.put("doorplate", unit.getDoorplate());
                     model.put("departmentId", unit.getDepartmentId());
                     model.put("departmentName", unit.getDepartmentName());
-                    List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userId);
+                    List<UptownHome> uptownHomes = uptownHomeMapper.getUptownHomeByUserId(userId);
                     model.put("linkman", uptownHomes.get(0).getLinkman());
                 }
             }
@@ -156,10 +156,9 @@ 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 {
+                                 @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
             UserOpen userOpen = homeService.getUserOpen();
@@ -190,7 +189,7 @@ public class UserOpenController {
                     model.put("doorplate", unit.getDoorplate());
                     model.put("departmentId", unit.getDepartmentId());
                     model.put("departmentName", unit.getDepartmentName());
-                    List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
+                    List<UptownHome> uptownHomes = uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
                     model.put("linkman", uptownHomes.get(0).getLinkman());
                 }
             }
@@ -231,7 +230,7 @@ public class UserOpenController {
                     model.put("doorplate", unit.getDoorplate());
                     model.put("departmentId", unit.getDepartmentId());
                     model.put("departmentName", unit.getDepartmentName());
-                    List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userId);
+                    List<UptownHome> uptownHomes = uptownHomeMapper.getUptownHomeByUserId(userId);
                     model.put("linkman", uptownHomes.get(0).getLinkman());
                 }
             }
@@ -248,8 +247,6 @@ public class UserOpenController {
     }
 
 
-
-
     @ApiOperation("商品团购")
     @ApiImplicitParams({@ApiImplicitParam(name = "userId", value = "用户ID", required = false, dataType = "Long", paramType = "query"),
             @ApiImplicitParam(name = "userType", value = "用户类型", required = false, dataType = "Integer", paramType = "query")
@@ -314,7 +311,7 @@ public class UserOpenController {
                     model.put("doorplate", unit.getDoorplate());
                     model.put("departmentId", unit.getDepartmentId());
                     model.put("departmentName", unit.getDepartmentName());
-                    List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userId);
+                    List<UptownHome> uptownHomes = uptownHomeMapper.getUptownHomeByUserId(userId);
                     model.put("linkman", uptownHomes.get(0).getLinkman());
                 }
             }
@@ -352,6 +349,7 @@ public class UserOpenController {
 
     /**
      * 凌云集团公司信息
+     *
      * @return
      */
     @GetMapping("/home/getUptownUnitLY.json")
@@ -362,6 +360,7 @@ public class UserOpenController {
 
     /**
      * 更改二级部门
+     *
      * @param request
      * @return
      */
@@ -384,6 +383,7 @@ public class UserOpenController {
 
     /**
      * 凌云集团更改部门
+     *
      * @return
      */
     @PostMapping("/home/changeUnitId.json")
@@ -396,6 +396,7 @@ public class UserOpenController {
 
     /**
      * 凌云集团更改工号
+     *
      * @return
      */
     @PostMapping("/home/changeDoorplate.json")
@@ -422,13 +423,12 @@ public class UserOpenController {
     }
 
 
-
     @PostMapping("/home/checkPhone.json")
     public ResultModel checkPhone(ModelMap model, HttpServletRequest request) {
         ResultModel resultModel = new ResultModel();
         String phone = request.getParameter("phone");
         List<UptownHome> homeList = uptownHomeMapper.getUptownHomeByPhone(phone);
-        if(homeList.size()>0){
+        if (homeList.size() > 0) {
             resultModel.put("success", false);
             resultModel.put("msg", "该手机号已注册！");
             return resultModel;
@@ -446,9 +446,9 @@ public class UserOpenController {
         String linkman = request.getParameter("linkman");
         String phone = request.getParameter("phone");
 
-        Integer area = StringUtils.isNullOrEmpty(request.getParameter("area"))?0:Integer.parseInt(request.getParameter("area"));
-        Long uptownId = StringUtils.isNullOrEmpty(request.getParameter("uptownId"))?0:Long.parseLong(request.getParameter("uptownId"));
-        Long unitId = StringUtils.isNullOrEmpty(request.getParameter("unitId"))?0:Long.parseLong(request.getParameter("unitId"));
+        Integer area = StringUtils.isNullOrEmpty(request.getParameter("area")) ? 0 : Integer.parseInt(request.getParameter("area"));
+        Long uptownId = StringUtils.isNullOrEmpty(request.getParameter("uptownId")) ? 0 : Long.parseLong(request.getParameter("uptownId"));
+        Long unitId = StringUtils.isNullOrEmpty(request.getParameter("unitId")) ? 0 : Long.parseLong(request.getParameter("unitId"));
         String doorplate = request.getParameter("doorplate");
         userOpenService.saveUserInfo(userId, 1, linkman, phone, area, uptownId, unitId, doorplate);
     }
@@ -460,7 +460,7 @@ public class UserOpenController {
         Long userId = Long.parseLong(request.getParameter("userId"));
         String phone = request.getParameter("phone");
 
-        ResultModel resultModel= userOpenService.bandUser(userId, phone);
+        ResultModel resultModel = userOpenService.bandUser(userId, phone);
 
         return resultModel;
     }