From 7d08291ec5ea99bf3fc6d89536ad396cab34d3fe Mon Sep 17 00:00:00 2001 From: xjm Date: Wed, 29 May 2024 15:51:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=BF=94=E5=9B=9E=E8=A1=8C?= =?UTF-8?q?=E6=94=BF=E5=8C=BA=E5=88=92=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/whdc/mapper/AddressBookMapper.java | 2 +- src/main/java/com/whdc/model/dto/UserRoleDto.java | 3 ++- src/main/java/com/whdc/model/entity/User.java | 2 +- src/main/java/com/whdc/model/vo/LoginVo.java | 3 +++ .../com/whdc/service/impl/UserServiceImpl.java | 14 +++++++++++++- src/main/resources/mapper/AddressBookMapper.xml | 12 ++++++++++++ 6 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/whdc/mapper/AddressBookMapper.java b/src/main/java/com/whdc/mapper/AddressBookMapper.java index ebd8bdf..7a53351 100644 --- a/src/main/java/com/whdc/mapper/AddressBookMapper.java +++ b/src/main/java/com/whdc/mapper/AddressBookMapper.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.whdc.model.dto.AddressBootDto; import com.whdc.model.entity.AddressBook; import com.whdc.model.vo.AddressBookVo; -import com.whdc.model.vo.ExcelABVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -21,5 +20,6 @@ public interface AddressBookMapper extends BaseMapper { List find(@Param("dto") AddressBook dto); List getListByAdnm(@Param("adnm") String adnm); + AddressBookVo getVoById(@Param("id") Integer id); } \ No newline at end of file diff --git a/src/main/java/com/whdc/model/dto/UserRoleDto.java b/src/main/java/com/whdc/model/dto/UserRoleDto.java index 3bae91a..30347fe 100644 --- a/src/main/java/com/whdc/model/dto/UserRoleDto.java +++ b/src/main/java/com/whdc/model/dto/UserRoleDto.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; /** * Description: @@ -25,6 +26,6 @@ public class UserRoleDto { @TableField("AB_ID") @ApiModelProperty(value = "通讯录id") - @NotEmpty(message = "通讯录id不能为空", groups = { Update.class}) + @NotNull(message = "通讯录id不能为空", groups = { Update.class}) private Integer abId; } diff --git a/src/main/java/com/whdc/model/entity/User.java b/src/main/java/com/whdc/model/entity/User.java index 1d475f8..ee70286 100644 --- a/src/main/java/com/whdc/model/entity/User.java +++ b/src/main/java/com/whdc/model/entity/User.java @@ -56,7 +56,7 @@ public class User extends Model implements Serializable { @TableField("AB_ID") @ApiModelProperty(value = "通讯录id") - @NotEmpty(message = "通讯录id不能为空", groups = {Insert.class, Update.class}) + @NotNull(message = "通讯录id不能为空", groups = {Insert.class, Update.class}) private Integer abId; @TableField("LAST_DATE") diff --git a/src/main/java/com/whdc/model/vo/LoginVo.java b/src/main/java/com/whdc/model/vo/LoginVo.java index 7c0c808..48e5f7e 100644 --- a/src/main/java/com/whdc/model/vo/LoginVo.java +++ b/src/main/java/com/whdc/model/vo/LoginVo.java @@ -42,4 +42,7 @@ public class LoginVo implements Serializable { @ApiModelProperty(value = "行政区划编码") private String adcd; + + @ApiModelProperty(value = "组织单位名称") + private String oname; } diff --git a/src/main/java/com/whdc/service/impl/UserServiceImpl.java b/src/main/java/com/whdc/service/impl/UserServiceImpl.java index f3dee1b..986d2d5 100644 --- a/src/main/java/com/whdc/service/impl/UserServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/UserServiceImpl.java @@ -13,6 +13,7 @@ import com.whdc.model.dto.LoginDto; import com.whdc.model.dto.UserDto; import com.whdc.model.entity.AddressBook; import com.whdc.model.entity.User; +import com.whdc.model.vo.AddressBookVo; import com.whdc.model.vo.LoginVo; import com.whdc.service.IUserService; import com.whdc.utils.HttpUtil; @@ -78,7 +79,7 @@ public class UserServiceImpl extends ServiceImpl implements IU LoginVo out = new LoginVo(); BeanUtils.copyProperties(sysUser, out); - AddressBook book = addressBookMapper.selectById(sysUser.getAbId()); + AddressBookVo book = addressBookMapper.getVoById(sysUser.getAbId()); if (Objects.nonNull(book)){ String adcd = book.getAdcd(); if (StringUtils.isNotBlank(adcd)) { @@ -92,8 +93,13 @@ public class UserServiceImpl extends ServiceImpl implements IU out.setAdcd(adcd); } + } out.setName(book.getName()); + out.setOname(book.getOname()); + if (StringUtils.isNotBlank(book.getAdnm())){ + out.setOname(book.getAdnm()); + } } return out; @@ -209,6 +215,12 @@ public class UserServiceImpl extends ServiceImpl implements IU } out.setName(addressBook.getName()); + out.setOname(addressBook.getOname()); + + AddressBookVo book = addressBookMapper.getVoById(sysUser.getAbId()); + if (StringUtils.isNotBlank(book.getAdnm())){ + out.setOname(book.getAdnm()); + } return out; } diff --git a/src/main/resources/mapper/AddressBookMapper.xml b/src/main/resources/mapper/AddressBookMapper.xml index ab1d70b..7752a5d 100644 --- a/src/main/resources/mapper/AddressBookMapper.xml +++ b/src/main/resources/mapper/AddressBookMapper.xml @@ -64,4 +64,16 @@ + + + \ No newline at end of file