diff --git a/screen-vue/src/views/myapp/note/list.vue b/screen-vue/src/views/myapp/note/list.vue index 47705da..cfaac0b 100644 --- a/screen-vue/src/views/myapp/note/list.vue +++ b/screen-vue/src/views/myapp/note/list.vue @@ -169,6 +169,10 @@ import CSearch from '@/components/Search/proSearch.vue' import PDialog from '@/components/Dialog/proDialog.vue' import VForm from './form.vue' +import { useUserStore } from '@/stores/user' + +const userStore = useUserStore() + const formComponentRef = ref(null) const saveLoading = ref(false) const loading = ref(false) @@ -240,10 +244,11 @@ async function getDataList() { loading.value = true try { const reqParams = { - pageNum: pagination.pageNum, - pageSize: pagination.pageSize, - type: activeTag.value, - ...searchForm, + ...searchForm, + pageNum: pagination.pageNum, + pageSize: pagination.pageSize, + type: activeTag.value, + createUser: userStore.loginUser.userName, } const res = await getNotesList(reqParams); pagination.total = res.total; @@ -341,7 +346,8 @@ const handleSave = async () => { const reqParams = { ...formData.value, isEdit: isEdit.value, - id: currentRow.value?.id + id: currentRow.value?.id, + createUser: userStore.loginUser.userName, } const res = await getNotesSave(reqParams); saveLoading.value = false diff --git a/src/main/java/com/mini/mybigscreen/biz/controller/NotesController.java b/src/main/java/com/mini/mybigscreen/biz/controller/NotesController.java index fea9df2..a070740 100644 --- a/src/main/java/com/mini/mybigscreen/biz/controller/NotesController.java +++ b/src/main/java/com/mini/mybigscreen/biz/controller/NotesController.java @@ -33,12 +33,13 @@ public class NotesController { @GetMapping("list") public Result getList(Integer pageNum, Integer pageSize, - String title, String priority, String ustatus, String type) { + String title, String priority, String ustatus, String type,String createUser) { LambdaQueryWrapper query = new LambdaQueryWrapper() .like(StrUtil.isNotBlank(title), Notes::getTitle, title) .eq(StrUtil.isNotBlank(priority), Notes::getPriority, priority) .eq(StrUtil.isNotBlank(ustatus), Notes::getUstatus, ustatus) .eq(StrUtil.isNotBlank(type), Notes::getType, type) + .eq(StrUtil.isNotBlank(createUser), Notes::getCreateUser, createUser) .orderByDesc(Notes::getCreateTime); List list = notesService.list(query); PageUtil util = new PageUtil<>(pageNum, pageSize, list);