添加新用户，如果用户存在则绑定

sso-server/src/main/java/com/uas/sso/controller/UserManagerController.java

@@ -204,11 +204,17 @@ public class UserManagerController extends BaseController {
             return error("参数错误");
         }
 
-        // 注册新用户，无密码则使用默认密码
-        if (StringUtils.isEmpty(user.getPassword())) {
-            user.setPassword("111111");
+        // 根据手机号判断用户是否为新用户，新用户注册，旧用户绑定
+        User oldUser = userService.findByMobile(user.getMobile());
+        if (oldUser == null) {
+            // 注册新用户，无密码则使用默认密码
+            if (StringUtils.isEmpty(user.getPassword())) {
+                user.setPassword("111111");
+            }
+            user = userService.register(user);
+        } else {
+            user = oldUser;
         }
-        user = userService.register(user);
 
         // 绑定企业
         userService.bindUserspace(user.getUserUU(), spaceUU);
@@ -246,7 +252,7 @@ public class UserManagerController extends BaseController {
         return error("请填写手机号");
     }
 
-    @RequestMapping("/update/password/{userUU}/{spaceUU}")
+    @RequestMapping(value = "/update/password/{userUU}/{spaceUU}", method = RequestMethod.POST)
     public ModelMap updatePassword(@PathVariable Long userUU, @PathVariable Long spaceUU, String password) {
         // 获取企业密钥
         Userspace userspace = userspaceService.findOne(spaceUU);
@@ -265,13 +271,13 @@ public class UserManagerController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/sync", method = RequestMethod.GET)
-    public ModelMap sync(@RequestParam(defaultValue = "1") int pageNumber, @RequestParam(defaultValue = "20") int pageSize, @RequestParam(defaultValue = "true") boolean isAll) {
+    public ModelMap sync(@RequestParam(defaultValue = "1") int pageNumber, @RequestParam(defaultValue = "20") int pageSize, @RequestParam(defaultValue = "true") boolean isAll, String mobile) {
         Page<UserDetail> pUsers = null;
         List<String> repeatMobile = new ArrayList<>();
         do {
             // 获取数据
             try {
-                pUsers = AccountUtils.findAllUserDetail(null, null, pageNumber++, pageSize);
+                pUsers = AccountUtils.findAllUserDetail(null, mobile, pageNumber++, pageSize);
             } catch (Exception e) {
                 writerToFile("pageNumber" + (pageNumber-1), null, e.getMessage());
             }