|
@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageInfo;
|
|
import com.github.pagehelper.PageInfo;
|
|
import com.hssx.cloudmodel.constant.Constant;
|
|
import com.hssx.cloudmodel.constant.Constant;
|
|
|
|
+import com.hssx.cloudmodel.entity.Role;
|
|
import com.hssx.cloudmodel.entity.User;
|
|
import com.hssx.cloudmodel.entity.User;
|
|
import com.hssx.cloudmodel.entity.vo.UserVO;
|
|
import com.hssx.cloudmodel.entity.vo.UserVO;
|
|
|
|
+import com.hssx.cloudmodel.mapper.RoleMapper;
|
|
import com.hssx.cloudmodel.mapper.UserMapper;
|
|
import com.hssx.cloudmodel.mapper.UserMapper;
|
|
import com.hssx.cloudmodel.service.UserService;
|
|
import com.hssx.cloudmodel.service.UserService;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
@@ -31,6 +33,8 @@ import java.util.UUID;
|
|
public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
|
|
public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
|
|
@Autowired
|
|
@Autowired
|
|
UserMapper userMapper;
|
|
UserMapper userMapper;
|
|
|
|
+ @Autowired
|
|
|
|
+ RoleMapper roleMapper;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public HttpRespMsg login(User user, HttpServletRequest request) {
|
|
public HttpRespMsg login(User user, HttpServletRequest request) {
|
|
@@ -80,6 +84,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
//创建账号默认密码"000000"
|
|
//创建账号默认密码"000000"
|
|
user.setPassword(MD5Util.getPassword("000000"));
|
|
user.setPassword(MD5Util.getPassword("000000"));
|
|
user.setHeadImgurl(UUID.randomUUID().toString().replaceAll("-", ""));
|
|
user.setHeadImgurl(UUID.randomUUID().toString().replaceAll("-", ""));
|
|
|
|
+ //获取角色所属的团体
|
|
|
|
+ Role role = roleMapper.selectById(user.getRoleType());
|
|
|
|
+ user.setTeamName(role.getSubordinate());
|
|
userMapper.insert(user);
|
|
userMapper.insert(user);
|
|
}
|
|
}
|
|
} else if (flag == 1) {
|
|
} else if (flag == 1) {
|