提交

jy-log/src/main/java/com/jy/log/dao/LogUserOperationDao.java

@@ -1,12 +1,12 @@
 package com.jy.log.dao;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jy.framework.model.base.BaseDao;
 import com.jy.log.mapper.LogUserOperationMapper;
 import com.jy.log.model.dto.LogUserOperationSelectDto;
 import com.jy.log.model.entity.LogUserOperation;
 import com.jy.log.model.table.LogUserOperationTable;
 import com.jy.log.model.vo.LogUserOperationVo;
-import com.jy.framework.model.base.BaseDao;
 import com.jy.system.service.AuthService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -29,7 +29,10 @@ public class LogUserOperationDao extends BaseDao<LogUserOperationMapper, LogUser
                 )
                 .from(luo)
                 .where(
-                        luo.createUser.in(authService.getUserPermissionSet())
+                        luo.moduleName.like(dto.getModuleName()),
+                        luo.operatorId.eq(dto.getOperatorId()),
+                        luo.operationType.eq(dto.getOperationType()),
+                        luo.auditStatus.eq(dto.getAuditStatus())
                 )
                 .orderBy(
                         luo.id.desc()

jy-log/src/main/java/com/jy/log/model/dto/LogUserOperationSelectDto.java

@@ -14,4 +14,24 @@ import lombok.Setter;
 @Setter
 public class LogUserOperationSelectDto extends BaseSelectDto {
 
+    /**
+     * 模块标题
+     */
+    private String moduleName;
+
+    /**
+     * 操作人ID
+     */
+    private Long operatorId;
+
+    /**
+     * 操作类型 2新增 3修改 4删除
+     */
+    private Integer operationType;
+
+    /**
+     * 审核状态 0待审核 1通过 2拒绝
+     */
+    private Integer auditStatus;
+
 }

jy-ui/src/views/business/log/userOperation/index.vue

@@ -4,7 +4,8 @@ import { FormConfigType } from '@/components/AForm/type'
 import { ToolbarConfigType } from '@/components/AToolbar/type'
 import { ColumnConfigType } from '@/components/ATable/type'
 import { StrAnyObj, StrAnyObjArr } from '@/typings'
-import { getPageApi, getDetailApi, editApi } from '@/api/business/log/userOperation'
+import { editApi, getDetailApi, getPageApi } from '@/api/business/log/userOperation'
+import { getListApi } from '@/api/system/user'
 
 const queryRef = ref<InstanceType<typeof AForm>>()
 const formRef = ref<InstanceType<typeof AForm>>()
@@ -25,9 +26,14 @@ const queryConfig: FormConfigType[] = [
     label: '操作模块'
   },
   {
-    type: 'input',
-    prop: 'operatorName',
-    label: '操作人'
+    type: 'select',
+    prop: 'operatorId',
+    label: '操作人',
+    keyName: 'id',
+    labelName: 'nickname',
+    async option() {
+      return await getListApi()
+    }
   },
   {
     type: 'select',