From dea44dcd78418ed3e7f191a73cee2b81a7a0019f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 13 一月 2023 16:21:17 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 c7a44fd..ecaa165 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
@@ -11,16 +11,16 @@
public interface UserMapper {
@Insert("INSERT INTO user (username, password, roleId, pushKey, createTime, updateTime) VALUES" +
- "('${username}', '${password}', '${role.id}', '${pushKey}', '${createTime}', '${updateTime}')")
+ "(#{username}, #{password}, #{role.id}, #{pushKey}, #{createTime}, #{updateTime})")
int add(User user);
@Update(value = {" <script>" +
"UPDATE user " +
- "SET updateTime='${updateTime}' " +
- "<if test=\"pushKey != null\">, pushKey='${pushKey}'</if>" +
- "<if test=\"role != null\">, roleId='${role.id}'</if>" +
- "<if test=\"password != null\">, password='${password}'</if>" +
- "<if test=\"username != null\">, username='${username}'</if>" +
+ "SET updateTime=#{updateTime} " +
+ "<if test=\"pushKey != null\">, pushKey=#{pushKey}</if>" +
+ "<if test=\"role != null\">, roleId=#{role.id}</if>" +
+ "<if test=\"password != null\">, password=#{password}</if>" +
+ "<if test=\"username != null\">, username=#{username}</if>" +
"WHERE id=#{id}" +
" </script>"})
int update(User user);
@@ -50,10 +50,10 @@
@ResultMap(value="roleMap")
List<User> selectAll();
- @Select("select * from (select user.*, concat('${callId}_', pushKey) as str1 from user) as u where md5(u.str1) = '${sign}'")
+ @Select("select * from (select user.*, concat(concat(#{callId}, '_'), pushKey) as str1 from user) as u where md5(u.str1) = #{sign}")
List<User> checkPushAuthorityByCallIdAndSign(String callId, String sign);
- @Select("select * from user where md5(pushKey) = '${sign}'")
+ @Select("select * from user where md5(pushKey) = #{sign}")
List<User> checkPushAuthorityByCallId(String sign);
@Select("select u.id, u.username,u.pushKey,u.roleId, r.id as roleID, r.name as roleName, r.authority as roleAuthority , r.createTime as roleCreateTime , r.updateTime as roleUpdateTime FROM user u join user_role r on u.roleId=r.id")
--
Gitblit v1.8.0