zhangyuewww 2 năm trước cách đây
mục cha
commit
f5b7ed2fca

+ 4 - 2
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonUserServiceImpl.java

@@ -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());

+ 1 - 1
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/CommonUserMapper.xml

@@ -156,7 +156,7 @@
 		on b.business_code = a.business_code
 		WHERE
 		1=1
-		AND a.create_user_id = #{userId}
+		AND (lower(a.message_content) like lower(CONCAT('%',#{name},'%')))
 		<if test="searchKeyWord != null and searchKeyWord != ''">
 			AND (lower(a.message_content) like lower(CONCAT('%',#{searchKeyWord},'%'))
 			OR lower(a.create_date) like lower(CONCAT('%',#{searchKeyWord},'%')))