通讯录新增修改手机号唯一验证

sql/data.sql

@@ -5,7 +5,7 @@ insert into "FXKH_TXL"."ORGANIZATION"("ID", "NAME") VALUES
     ('3','省防指成员单位' ),
     ('4','市、县防指、防办' ),
     ('5','主要湖泊' ),
-    ('6','重要提防' ),
+    ('6','重要堤防' ),
     ('7','主要蓄滞洪区' ),
     ('8','大型水库大坝' ),
     ('9','重点泵站' ),

src/main/java/com/whdc/controller/AddressBookController.java

@@ -114,8 +114,12 @@ public class AddressBookController {
             //"省防指".equals(organizationsService.getById(model.getOrganization()).getName())
             //                    &&
             if (StringUtils.isBlank(model.getPhone())){
-
+                if (StringUtils.isNotBlank(model.getTel())){
+                    userService.register( model.getTel(), model.getId(),model.getRole());
+                }else{
                     userService.register( model.getName(), model.getId(),model.getRole());
+                }
+
             }else{
                 userService.register( model.getPhone(), model.getId(),model.getRole());
             }
@@ -192,6 +196,42 @@ public class AddressBookController {
             abUdRService.lambdaUpdate()
                     .set(AbUdR::getDictId,model.getOrganization())
                     .eq(AbUdR::getAdId,model.getId());
+
+            User one = userService.lambdaQuery().eq(User::getAbId, model.getId()).one();
+            if (Objects.nonNull(one)){
+                // 没有就创建账号
+                if (StringUtils.isBlank(model.getPhone())){
+                    if (StringUtils.isNotBlank(model.getTel())){
+                        if (!one.getUsername().equals(model.getTel())) {
+                            one.setUsername(model.getTel())
+                                    .updateById();
+                        }
+                    }else{
+                        if (!one.getUsername().equals(model.getName())) {
+                            one.setUsername(model.getName())
+                                    .updateById();
+                        }
+                    }
+
+                }else{
+                    if (!one.getUsername().equals(model.getPhone())) {
+                        one.setUsername(model.getPhone())
+                                .updateById();
+                    }
+                }
+            }else{
+                // 没有就创建账号
+                if (StringUtils.isBlank(model.getPhone())){
+                    if (StringUtils.isNotBlank(model.getTel())){
+                        userService.register( model.getTel(), model.getId(),model.getRole());
+                    }else{
+                        userService.register( model.getName(), model.getId(),model.getRole());
+                    }
+
+                }else{
+                    userService.register( model.getPhone(), model.getId(),model.getRole());
+                }
+            }
         }
 
         return ResultJson.ok(data);