|
@@ -48,7 +48,7 @@ public interface UserConvert {
|
|
|
default UserProfileRespVO convert(AdminUserDO user, List<RoleDO> userRoles,
|
|
default UserProfileRespVO convert(AdminUserDO user, List<RoleDO> userRoles,
|
|
|
DeptDO dept, List<PostDO> posts, List<SocialUserDO> socialUsers,
|
|
DeptDO dept, List<PostDO> posts, List<SocialUserDO> socialUsers,
|
|
|
boolean rdReportFlag, boolean rdNonProductFlag, boolean rhReportFlag,
|
|
boolean rdReportFlag, boolean rdNonProductFlag, boolean rhReportFlag,
|
|
|
- boolean rhReportApprovalFlag, boolean ryReportFlag, boolean rdReportApprovalFlag,
|
|
|
|
|
|
|
+ boolean rhReportApprovalFlag, boolean ryReportFlag, boolean rdReportApprovalFlag, boolean rdReportStatisticsFlag,
|
|
|
boolean ryReportApprovalFlag, boolean ryXjReportFlag, boolean ryXjReportApprovalFlag) {
|
|
boolean ryReportApprovalFlag, boolean ryXjReportFlag, boolean ryXjReportApprovalFlag) {
|
|
|
UserProfileRespVO userVO = BeanUtils.toBean(user, UserProfileRespVO.class);
|
|
UserProfileRespVO userVO = BeanUtils.toBean(user, UserProfileRespVO.class);
|
|
|
userVO.setRoles(BeanUtils.toBean(userRoles, RoleSimpleRespVO.class));
|
|
userVO.setRoles(BeanUtils.toBean(userRoles, RoleSimpleRespVO.class));
|
|
@@ -58,6 +58,7 @@ public interface UserConvert {
|
|
|
userVO.setRdReportFlag(rdReportFlag);
|
|
userVO.setRdReportFlag(rdReportFlag);
|
|
|
userVO.setRdReportApprovalFlag(rdReportApprovalFlag);
|
|
userVO.setRdReportApprovalFlag(rdReportApprovalFlag);
|
|
|
userVO.setRdNonProductFlag(rdNonProductFlag);
|
|
userVO.setRdNonProductFlag(rdNonProductFlag);
|
|
|
|
|
+ userVO.setRdReportStatisticsFlag(rdReportStatisticsFlag);
|
|
|
userVO.setRhReportFlag(rhReportFlag);
|
|
userVO.setRhReportFlag(rhReportFlag);
|
|
|
userVO.setRhReportApprovalFlag(rhReportApprovalFlag);
|
|
userVO.setRhReportApprovalFlag(rhReportApprovalFlag);
|
|
|
userVO.setRyReportFlag(ryReportFlag);
|
|
userVO.setRyReportFlag(ryReportFlag);
|