diff --git a/src/main/java/com/whdc/service/impl/UserServiceImpl.java b/src/main/java/com/whdc/service/impl/UserServiceImpl.java index f86ac83..475b879 100644 --- a/src/main/java/com/whdc/service/impl/UserServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/UserServiceImpl.java @@ -3,13 +3,16 @@ package com.whdc.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.whdc.exception.MyException; +import com.whdc.mapper.AddressBookMapper; import com.whdc.mapper.UserMapper; import com.whdc.model.dto.LoginDto; +import com.whdc.model.entity.AddressBook; import com.whdc.model.entity.User; import com.whdc.model.vo.LoginVo; import com.whdc.service.IUserService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.DigestUtils; @@ -30,6 +33,9 @@ public class UserServiceImpl extends ServiceImpl implements IU public static final String DEFAULT_PASSWORD = "Fxkh@123456"; + @Autowired + private AddressBookMapper addressBookMapper; + @Override public IPage page(User dto) { return baseMapper.page(new Page<>(), dto); @@ -55,6 +61,9 @@ public class UserServiceImpl extends ServiceImpl implements IU if (getPassword(sysUser.getSalt() ,dto.getPassword()).equals(sysUser.getPassword())) { LoginVo out = new LoginVo(); BeanUtils.copyProperties(sysUser, out); + + AddressBook book = addressBookMapper.selectById(sysUser.getAbId()); + out.setName(book.getName()); return out; } diff --git a/src/main/resources/mapper/UnitDictMapper.xml b/src/main/resources/mapper/UnitDictMapper.xml index 284066e..e98ec78 100644 --- a/src/main/resources/mapper/UnitDictMapper.xml +++ b/src/main/resources/mapper/UnitDictMapper.xml @@ -15,7 +15,7 @@ F.SORT FSORT FROM UNIT_DICT UD - LEFT JOIN FC F ON F.AB_ID = O.ID + LEFT JOIN FC F ON F.AB_ID = UD.O_ID F.USER_ID = #{userId}