|
|
@@ -14,6 +14,8 @@ import com.hz.pm.api.sys.model.entity.Role; |
|
|
|
import com.hz.pm.api.sys.model.entity.UserRole; |
|
|
|
import com.hz.pm.api.sys.service.IRoleService; |
|
|
|
import com.hz.pm.api.sys.service.IUserRoleService; |
|
|
|
import com.hz.pm.api.user.helper.MhUnitCache; |
|
|
|
import com.hz.pm.api.user.model.dto.UnitDTO; |
|
|
|
import com.hz.pm.api.user.model.entity.UserInfo; |
|
|
|
import com.hz.pm.api.user.model.enumeration.UserAvailableEnum; |
|
|
|
import com.hz.pm.api.user.model.po.ReqUserDetailEditPO; |
|
|
@@ -47,6 +49,7 @@ import java.util.stream.Collectors; |
|
|
|
@RequiredArgsConstructor |
|
|
|
public class UserInfoManage { |
|
|
|
|
|
|
|
private final MhUnitCache mhUnitCache; |
|
|
|
private final UserAuthManage userAuthManage; |
|
|
|
private final IUserInfoService userInfoService; |
|
|
|
private final IRoleService roleService; |
|
|
@@ -276,6 +279,10 @@ public class UserInfoManage { |
|
|
|
resUserDetail.setStatus(userInfo.getAvailable()); |
|
|
|
resUserDetail.setEmployeeCode(userInfo.getEmployeeCode()); |
|
|
|
resUserDetail.setMhUnitId(userInfo.getMhUnitId()); |
|
|
|
UnitDTO unit = mhUnitCache.getById(userInfo.getMhUnitId()); |
|
|
|
if (unit != null && unit.getType() != null) { |
|
|
|
resUserDetail.setUnitStrip(unit.getType().getStrip().getCode()); |
|
|
|
} |
|
|
|
resUserDetail.setMhUnitName(userInfo.getMhUnitName()); |
|
|
|
|
|
|
|
// 装配用户角色信息列表 |
|
|
|