用户增加部门信息

release_1.0.0
liu 10 months ago
parent 55432b8039
commit ca05bbf00a

@ -12,8 +12,10 @@ import com.supervision.knowsub.domain.UserInfo;
import com.supervision.knowsub.dto.role.UserRoleDTO;
import com.supervision.knowsub.dto.user.UserPageQuery;
import com.supervision.knowsub.exception.BusinessException;
import com.supervision.knowsub.model.SystemDept;
import com.supervision.knowsub.model.SystemRole;
import com.supervision.knowsub.model.SystemUser;
import com.supervision.knowsub.service.SystemDeptService;
import com.supervision.knowsub.service.SystemRoleService;
import com.supervision.knowsub.service.UserManageService;
import com.supervision.knowsub.service.UserRoleRelationManageService;
@ -48,6 +50,8 @@ public class UserManageServiceImpl implements UserManageService {
private final SystemRoleService systemRoleService;
private final SystemDeptService systemDeptService;
@Override
@Transactional(rollbackFor = Exception.class)
public LoginResVO login(LoginReqVO reqVO) {
@ -66,6 +70,9 @@ public class UserManageServiceImpl implements UserManageService {
loginResVO.setUsername(user.get().getUsername());
List<UserRoleDTO> userRoleDTOS = userRoleRelationManageService.listUserRole(user.get().getId(),null);
loginResVO.setUserRoleDTOList(userRoleDTOS);
// 获取用户的部门
Optional<SystemDept> optById = systemDeptService.getOptById(user.get().getDeptId());
loginResVO.setDeptName(optById.isPresent() ? optById.get().getDeptName() : "未知部门");
return loginResVO;
}

@ -25,6 +25,10 @@ public class LoginResVO {
@Schema(description = "token")
private String token;
@Schema(description = "所属部门ID")
private String deptId;
@Schema(description = "所属部门名称")
private String deptName;
private static final long serialVersionUID = 1L;
}

Loading…
Cancel
Save