|
@@ -3,6 +3,7 @@ package com.management.platform.service.impl;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.management.platform.entity.Company;
|
|
|
import com.management.platform.entity.User;
|
|
|
+import com.management.platform.entity.vo.UserVO;
|
|
|
import com.management.platform.mapper.CompanyMapper;
|
|
|
import com.management.platform.mapper.UserMapper;
|
|
|
import com.management.platform.service.UserService;
|
|
@@ -17,6 +18,7 @@ import org.apache.poi.xssf.usermodel.XSSFCell;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFRow;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFSheet;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
@@ -58,7 +60,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
httpRespMsg.setError("非管理员不能登陆系统");
|
|
|
} else if (MD5Util.getPassword(password).equals(userList.get(0).getPassword())) {
|
|
|
//检测密码正确时
|
|
|
- httpRespMsg.data = userList.get(0);
|
|
|
+ UserVO userVO = new UserVO();
|
|
|
+ BeanUtils.copyProperties(userVO, userList.get(0));
|
|
|
+ userVO.setCompanyName(companyMapper.selectById(userVO.getCompanyId()).getCompanyName());
|
|
|
+ httpRespMsg.data = userVO;
|
|
|
} else {
|
|
|
httpRespMsg.setError("密码错误");
|
|
|
}
|