代码提交
parent
16962b6dc9
commit
995a33159a
|
|
@ -8,11 +8,9 @@ import com.whdc.model.entity.AddressBook;
|
||||||
import com.whdc.model.entity.User;
|
import com.whdc.model.entity.User;
|
||||||
import com.whdc.model.enums.Role;
|
import com.whdc.model.enums.Role;
|
||||||
import com.whdc.model.enums.VersionsType;
|
import com.whdc.model.enums.VersionsType;
|
||||||
import com.whdc.model.group.Find;
|
|
||||||
import com.whdc.model.group.Insert;
|
import com.whdc.model.group.Insert;
|
||||||
import com.whdc.model.group.Update;
|
import com.whdc.model.group.Update;
|
||||||
import com.whdc.model.vo.AddressBookVo;
|
import com.whdc.model.vo.AddressBookVo;
|
||||||
import com.whdc.model.vo.FcVo;
|
|
||||||
import com.whdc.service.*;
|
import com.whdc.service.*;
|
||||||
import com.whdc.utils.ResultJson;
|
import com.whdc.utils.ResultJson;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
|
|
@ -21,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.collections.CollectionUtils;
|
import org.apache.commons.collections.CollectionUtils;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
|
@ -34,6 +33,7 @@ import java.util.Objects;
|
||||||
@Api(tags = "通讯录 - Controller")
|
@Api(tags = "通讯录 - Controller")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/addressbook")
|
@RequestMapping("/addressbook")
|
||||||
|
@Transactional
|
||||||
public class AddressBookController {
|
public class AddressBookController {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
|
|
@ -98,8 +98,9 @@ public class AddressBookController {
|
||||||
|
|
||||||
if (save){
|
if (save){
|
||||||
// 没有手机号用名字注册
|
// 没有手机号用名字注册
|
||||||
if ("省防指".equals(organizationsService.getById(model.getOrganization()).getName())
|
//"省防指".equals(organizationsService.getById(model.getOrganization()).getName())
|
||||||
&& StringUtils.isBlank(model.getPhone())){
|
// &&
|
||||||
|
if (StringUtils.isBlank(model.getPhone())){
|
||||||
|
|
||||||
userService.register( model.getName(), model.getId(),model.getRole());
|
userService.register( model.getName(), model.getId(),model.getRole());
|
||||||
}else{
|
}else{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue