From 4952d880c15ee15dcd140685ddb521e47f3d8f75 Mon Sep 17 00:00:00 2001 From: Xusan <1105644308@QQ.COM> Date: Thu, 16 May 2024 11:57:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/whdc/controller/AddressBookController.java | 4 ++-- src/main/java/com/whdc/model/entity/AddressBook.java | 5 +++++ src/main/java/com/whdc/service/IUserService.java | 2 +- src/main/java/com/whdc/service/impl/UserServiceImpl.java | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/whdc/controller/AddressBookController.java b/src/main/java/com/whdc/controller/AddressBookController.java index 86f6a47..82ea948 100644 --- a/src/main/java/com/whdc/controller/AddressBookController.java +++ b/src/main/java/com/whdc/controller/AddressBookController.java @@ -100,9 +100,9 @@ public class AddressBookController { if ("省防指".equals(organizationsService.getById(model.getOrganization()).getName()) && StringUtils.isBlank(model.getPhone())){ - userService.register( model.getName(), model.getId()); + userService.register( model.getName(), model.getId(),model.getRole()); }else{ - userService.register( model.getPhone(), model.getId()); + userService.register( model.getPhone(), model.getId(),model.getRole()); } } diff --git a/src/main/java/com/whdc/model/entity/AddressBook.java b/src/main/java/com/whdc/model/entity/AddressBook.java index f9c0b3e..8630bd1 100644 --- a/src/main/java/com/whdc/model/entity/AddressBook.java +++ b/src/main/java/com/whdc/model/entity/AddressBook.java @@ -85,5 +85,10 @@ public class AddressBook extends Model implements Serializable { @ApiModelProperty(value = "创建人id") private String createId; + @TableField(exist = false) + @ApiModelProperty(value = "权限 0:普通管理员,1:政区管理员,99:系统管理员") + @NotEmpty(message = "权限不能为空", groups = {Insert.class}) + private String role; + } \ No newline at end of file diff --git a/src/main/java/com/whdc/service/IUserService.java b/src/main/java/com/whdc/service/IUserService.java index 5b73902..7958a51 100644 --- a/src/main/java/com/whdc/service/IUserService.java +++ b/src/main/java/com/whdc/service/IUserService.java @@ -31,7 +31,7 @@ public interface IUserService extends IService { String getRole(Integer id); - boolean register(String phone, Integer abId); + boolean register(String phone, Integer abId, String role); boolean updateLastDate(Integer id); diff --git a/src/main/java/com/whdc/service/impl/UserServiceImpl.java b/src/main/java/com/whdc/service/impl/UserServiceImpl.java index 475b879..31e9baf 100644 --- a/src/main/java/com/whdc/service/impl/UserServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/UserServiceImpl.java @@ -93,9 +93,10 @@ public class UserServiceImpl extends ServiceImpl implements IU } @Override - public boolean register(String phone, Integer abId) { + public boolean register(String phone, Integer abId, String role) { User user = new User(); user.setAbId(abId) + .setRole(role) .setUsername(phone); return register(user); }