|
@@ -864,8 +864,10 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
|
|
|
Map<String, Object> pageView = new HashMap<>();
|
|
|
pageView.put("startRecord", (noticeTask.getCurrentPage() - 1)
|
|
|
* noticeTask.getPageSize());
|
|
|
- // 公司ID
|
|
|
- pageView.put("userId", AuthSecurityUtils.getCurrentUserId());
|
|
|
+ if (noticeTask.getCreateUserId() == null || noticeTask.getCreateUserId().isEmpty()) {
|
|
|
+ noticeTask.setCreateUserId(AuthSecurityUtils.getCurrentUserId());
|
|
|
+ }
|
|
|
+ pageView.put("name", AuthSecurityUtils.getStaffById(noticeTask.getCreateUserId()).getStaffName()+"提交");
|
|
|
pageView.put("roleId", AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getMajorRoleId());
|
|
|
pageView.put("pageSize", noticeTask.getPageSize());
|
|
|
pageView.put("currentPage", noticeTask.getCurrentPage());
|