From 3a710e5c990e10c2198e5dcd96a84bd43b33656c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 25 十一月 2023 14:34:43 +0800
Subject: [PATCH] 关键属性/,空值校验sql拼接修改

---
 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogOperateServiceImpl.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 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 9c02711..a7d5fd0 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
@@ -6,12 +6,15 @@
 import com.vci.ubcs.log.entity.LogOperate;
 import com.vci.ubcs.log.mapper.LogOperateMapper;
 import com.vci.ubcs.log.service.ILogOperateService;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 鎿嶄綔鏃ュ織绠$悊:(鍖呮嫭鐧诲綍鏃ュ織銆佹搷浣滄棩蹇椼�佹巿鏉冩棩蹇楋紝浠ュ強绠$悊鍛樼殑浠ヤ笂涓夌鏃ュ織)
@@ -30,7 +33,7 @@
 	 * @return
 	 */
 	@Override
-	public boolean saveLogOperate(LogOperate logOperate) {
+	public boolean saveLogOperate(LogOperate logOperate)throws ServiceException {
 		if(Func.isEmpty(logOperate)){
 			return false;
 		}
@@ -39,13 +42,17 @@
 
 	/**
 	 * 鏉′欢鏌ヨ鑾峰彇鏃ュ織鍒楄〃
-	 * @param logOperate
+	 * @param bladeQueryObject
 	 * @return
 	 */
 	@Override
-	public List<LogOperate> listByCondition(LogOperate logOperate) {
-		QueryWrapper<LogOperate> queryWrapper = Condition.getQueryWrapper(logOperate);
-		this.list(queryWrapper);
+	public List<LogOperate> listByCondition(BladeQueryObject bladeQueryObject) throws ServiceException{
+		Map<String, Object> conditionMap = bladeQueryObject.getConditionMap();
+		if(conditionMap.isEmpty() || Func.isBlank(conditionMap.get("logType").toString())){
+			throw new ServiceException("鏃ュ織鏌ヨ蹇呬紶鍙傛暟銆愭棩蹇楃被鍨嬨�戜笉鑳戒负绌猴紒");
+		}
+		// map瀵硅薄杞崲涓烘煡璇㈠璞�
+		QueryWrapper<LogOperate> queryWrapper = Condition.getQueryWrapper(bladeQueryObject.getConditionMap(),LogOperate.class);
 		return this.list(queryWrapper);
 	}
 

--
Gitblit v1.9.3