From 2cedb574c22cf2f77418929e79f23ace0a7e7ac6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 29 四月 2024 10:05:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogOperateServiceImpl.java |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogOperateServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogOperateServiceImpl.java
index 3e739d8..2535d60 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogOperateServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogOperateServiceImpl.java
@@ -1,6 +1,10 @@
 package com.vci.ubcs.log.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.vci.ubcs.log.mapper.LogOperateMapper;
@@ -60,8 +64,37 @@
 			throw new ServiceException("鏃ュ織鏌ヨ蹇呬紶鍙傛暟銆愭棩蹇楃被鍨嬨�戜笉鑳戒负绌猴紒");
 		}
 		// map瀵硅薄杞崲涓烘煡璇㈠璞�
-		IPage<LogOperate> logOperateIPage = this.logOperateMapper.selectPage(Condition.getPage(bladeQueryObject.getQuery().setDescs("TIME")), UBCSCondition.getQueryWrapper(bladeQueryObject.getConditionMap(), LogOperate.class));
+		LambdaQueryWrapper<LogOperate> wrapper = UBCSCondition.getQueryWrapper(bladeQueryObject.getConditionMap(), LogOperate.class).lambda();
+		wrapper.select(
+			LogOperate::getOid,
+			LogOperate::getUserName,
+			LogOperate::getRealName,
+			LogOperate::getIp,
+			LogOperate::getModel,
+			LogOperate::getOperate,
+			LogOperate::getTime,
+			LogOperate::getOperateResult,
+			LogOperate::getLogType,
+			LogOperate::getIsAdmin
+			);
+		IPage<LogOperate> logOperateIPage = this.logOperateMapper.selectPage(Condition.getPage(bladeQueryObject.getQuery().setDescs("TIME")), wrapper);
 		return logOperateIPage;
 	}
 
+	/**
+	 * 鏍规嵁oid鏌ヨ鏃ュ織璇︽儏
+	 * @param oid
+	 * @return
+	 * @throws ServiceException
+	 */
+	@Override
+	public LogOperate detailByOid(String oid) throws ServiceException {
+		if(Func.isBlank(oid)){
+			throw new ServiceException("蹇呬紶鍙傛暟鏃ュ織鐨刼id涓嶈兘涓虹┖锛�");
+		}
+		LogOperate logOperate = this.logOperateMapper.selectOne(Wrappers.<LogOperate>query().lambda().eq(LogOperate::getOid, oid));
+		return logOperate;
+	}
+
+
 }

--
Gitblit v1.9.3