From 4df90d9ba440e01efe5b1b8958d86b2dd9b5d2b7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 20 九月 2023 09:17:28 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
index c96aeaf..168a577 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
@@ -2,6 +2,7 @@
import com.genersoft.iot.vmp.storager.dao.dto.User;
import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -36,7 +37,7 @@
@Result(column = "role_create_time", property = "role.createTime"),
@Result(column = "role_update_time", property = "role.updateTime")
})
- User select(String username, String password);
+ User select(@Param("username") String username, @Param("password") String password);
@Select("select u.*, r.id as role_id, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id and u.id=#{id}")
@ResultMap(value="roleMap")
@@ -55,5 +56,5 @@
List<User> getUsers();
@Update("UPDATE wvp_user set push_key=#{pushKey} where id=#{id}")
- int changePushKey(int id, String pushKey);
+ int changePushKey(@Param("id") int id, @Param("pushKey") String pushKey);
}
--
Gitblit v1.8.0