From 81327501e9d2049f8bedda07462632064f4d327c Mon Sep 17 00:00:00 2001
From: Xusan <1105644308@QQ.COM>
Date: Wed, 22 May 2024 10:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=94=AF=E4=B8=80?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/data.sql                                  |  2 +-
 .../controller/AddressBookController.java     | 42 ++++++++++++++++++-
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/sql/data.sql b/sql/data.sql
index 9a1cbf6..c734542 100644
--- a/sql/data.sql
+++ b/sql/data.sql
@@ -5,7 +5,7 @@ insert into "FXKH_TXL"."ORGANIZATION"("ID", "NAME") VALUES
     ('3','省防指成员单位' ),
     ('4','市、县防指、防办' ),
     ('5','主要湖泊' ),
-    ('6','重要提防' ),
+    ('6','重要堤防' ),
     ('7','主要蓄滞洪区' ),
     ('8','大型水库大坝' ),
     ('9','重点泵站' ),
diff --git a/src/main/java/com/whdc/controller/AddressBookController.java b/src/main/java/com/whdc/controller/AddressBookController.java
index 7d2fab2..1042a08 100644
--- a/src/main/java/com/whdc/controller/AddressBookController.java
+++ b/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());
+                }
 
-                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);