From f75f6404b806604ec34c47525f20a968e7e308bc Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Fri, 5 May 2023 09:25:06 +0800
Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kening/vordm/controller/ToolController.java    | 5 +----
 .../main/java/com/kening/vordm/mapper/GuestInfoMapper.xml   | 6 +++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java
index c8b6c2e..f38b0c5 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java
@@ -39,10 +39,7 @@ public class ToolController{
 			queryWrapper.like("tool_name", tool.getToolName());
 		}
 		if(!StringUtils.isEmpty(tool.getLabel())){
-			queryWrapper.like("Introduction", tool.getLabel());
-		}
-		if(!StringUtils.isEmpty(tool.getLabel())){
-			queryWrapper.like("label", tool.getLabel());
+			queryWrapper.like("Introduction", tool.getLabel()).or().like("label", tool.getLabel());
 		}
 		String checkd = tool.getChecked();
 		if(checkd != null && checkd.equals("1")){
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
index fb8f788..15040a8 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
@@ -28,9 +28,9 @@
     </update>
 
     <update id="updateAccount">
-        update blade_user t set t.name = #{name}, t.real_name = #{realName}, t.organization = #{organization},
-                                t.research_field = #{researchField}, t.occupation = #{occupation}, t.code = #{country}
-        where t.id = #{id}
+        update blade_user t set t.name = #{userVo.name}, t.real_name = #{userVo.realName}, t.organization = #{userVo.organization},
+                                t.research_field = #{userVo.researchField}, t.occupation = #{userVo.occupation}, t.code = #{userVo.country}
+        where t.id = #{userVo.id}
     </update>
 
     <select id="getBladeUserByEmail" resultType="com.kening.vordm.vo.UserVo">