From 995a33159a8ab32ff98775495a054222d5a58668 Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Thu, 16 May 2024 18:03:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/whdc/controller/AddressBookController.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/whdc/controller/AddressBookController.java b/src/main/java/com/whdc/controller/AddressBookController.java
index 2e6d0cb..37f50dd 100644
--- a/src/main/java/com/whdc/controller/AddressBookController.java
+++ b/src/main/java/com/whdc/controller/AddressBookController.java
@@ -8,11 +8,9 @@ import com.whdc.model.entity.AddressBook;
 import com.whdc.model.entity.User;
 import com.whdc.model.enums.Role;
 import com.whdc.model.enums.VersionsType;
-import com.whdc.model.group.Find;
 import com.whdc.model.group.Insert;
 import com.whdc.model.group.Update;
 import com.whdc.model.vo.AddressBookVo;
-import com.whdc.model.vo.FcVo;
 import com.whdc.service.*;
 import com.whdc.utils.ResultJson;
 import io.swagger.annotations.Api;
@@ -21,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -34,6 +33,7 @@ import java.util.Objects;
 @Api(tags = "通讯录 - Controller")
 @RestController
 @RequestMapping("/addressbook")
+@Transactional
 public class AddressBookController {
 
     @Autowired
@@ -98,8 +98,9 @@ public class AddressBookController {
 
         if (save){
             // 没有手机号用名字注册
-            if ("省防指".equals(organizationsService.getById(model.getOrganization()).getName())
-                    && StringUtils.isBlank(model.getPhone())){
+            //"省防指".equals(organizationsService.getById(model.getOrganization()).getName())
+            //                    &&
+            if (StringUtils.isBlank(model.getPhone())){
 
                 userService.register( model.getName(), model.getId(),model.getRole());
             }else{