This is an automated email from the ASF dual-hosted git repository.
nicholasjiang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/paimon-webui.git
commit 71796946c914e5cb37c41f8f5dda9a9a2baaf378
Author: XianmingZhou00 <147145809+xianmingzho...@users.noreply.github.com>
AuthorDate: Thu Jul 11 14:13:57 2024 +0800
[Bugfix] Fix adding user failure (#498)
---
.../apache/paimon/web/server/data/model/User.java | 4 ---
.../src/main/resources/mapper/UserMapper.xml | 41 +++++++++++-----------
.../web/server/controller/UserControllerTest.java | 3 --
scripts/sql/paimon-mysql.sql | 1 -
4 files changed, 21 insertions(+), 28 deletions(-)
diff --git
a/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/model/User.java
b/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/model/User.java
index 4ad8c1f3..b6ff5e76 100644
---
a/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/model/User.java
+++
b/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/model/User.java
@@ -23,7 +23,6 @@ import org.apache.paimon.web.server.data.enums.UserType;
import org.apache.paimon.web.server.validator.annotation.PhoneNumber;
import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -61,9 +60,6 @@ public class User extends BaseModel {
/** is enable. */
private Boolean enabled;
- /** is delete. */
- @TableLogic private Boolean isDelete;
-
/** avatar url. */
private String url;
diff --git a/paimon-web-server/src/main/resources/mapper/UserMapper.xml
b/paimon-web-server/src/main/resources/mapper/UserMapper.xml
index d8d544a2..233fe251 100644
--- a/paimon-web-server/src/main/resources/mapper/UserMapper.xml
+++ b/paimon-web-server/src/main/resources/mapper/UserMapper.xml
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectUserVo">
- select u.id, u.username, u.nickname, u.user_type, u.email, u.url,
u.mobile, u.password, u.is_delete, u.enabled, u.create_time,
+ select u.id, u.username, u.nickname, u.user_type, u.email, u.url,
u.mobile, u.password, u.enabled, u.create_time,
u.update_time, r.id, r.role_name, r.role_key, r.sort, r.enabled as
role_status
from user u
left join user_role urole on u.id = urole.user_id
@@ -71,25 +71,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="listUsers"
parameterType="org.apache.paimon.web.server.data.model.User"
resultMap="UserWithRolesResult">
<include refid="selectUserVo"/>
- where u.is_delete = '0'
- <if test="user.id != null and user.id != 0">
- AND u.id = #{user.id}
- </if>
- <if test="user.username != null and user.username != ''">
- AND u.username like concat('%', #{user.username}, '%')
- </if>
- <if test="user.enabled != null and user.enabled != ''">
- AND u.enabled = #{user.enabled}
- </if>
- <if test="user.mobile != null and user.mobile != ''">
- AND u.mobile like concat('%', #{user.mobile}, '%')
- </if>
- <if test="user.params.beginTime != null and
user.params.beginTime != ''"><!-- Start time search -->
- AND date_format(u.create_time,'%y%m%d') >=
date_format(#{user.params.beginTime},'%y%m%d')
- </if>
- <if test="user.params.endTime != null and user.params.endTime
!= ''"><!-- End time search -->
- AND date_format(u.create_time,'%y%m%d') <=
date_format(#{user.params.endTime},'%y%m%d')
- </if>
+ <where>
+ <if test="user.id != null and user.id != 0">
+ AND u.id = #{user.id}
+ </if>
+ <if test="user.username != null and user.username !=
''">
+ AND u.username like concat('%',
#{user.username}, '%')
+ </if>
+ <if test="user.enabled != null and user.enabled != ''">
+ AND u.enabled = #{user.enabled}
+ </if>
+ <if test="user.mobile != null and user.mobile != ''">
+ AND u.mobile like concat('%', #{user.mobile},
'%')
+ </if>
+ <if test="user.params.beginTime != null and
user.params.beginTime != ''"><!-- Start time search -->
+ AND date_format(u.create_time,'%y%m%d') >=
date_format(#{user.params.beginTime},'%y%m%d')
+ </if>
+ <if test="user.params.endTime != null and
user.params.endTime != ''"><!-- End time search -->
+ AND date_format(u.create_time,'%y%m%d') <=
date_format(#{user.params.endTime},'%y%m%d')
+ </if>
+ </where>
</select>
<select id="selectAllocatedList"
parameterType="org.apache.paimon.web.server.data.dto.RoleWithUserDTO"
resultMap="SysUserResult">
diff --git
a/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/UserControllerTest.java
b/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/UserControllerTest.java
index 74d2aeb7..5c60fc08 100644
---
a/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/UserControllerTest.java
+++
b/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/UserControllerTest.java
@@ -73,7 +73,6 @@ public class UserControllerTest extends ControllerTestBase {
user.setPassword("test");
user.setUserType(UserType.LOCAL);
user.setEnabled(true);
- user.setIsDelete(false);
mockMvc.perform(
MockMvcRequestBuilders.post(userPath)
@@ -105,7 +104,6 @@ public class UserControllerTest extends ControllerTestBase {
user.setNickname(newUserName);
user.setUserType(UserType.LOCAL);
user.setEnabled(true);
- user.setIsDelete(false);
mockMvc.perform(
MockMvcRequestBuilders.put(userPath)
@@ -142,7 +140,6 @@ public class UserControllerTest extends ControllerTestBase {
user.setNickname(username);
user.setUserType(UserType.LOCAL);
user.setEnabled(true);
- user.setIsDelete(false);
user.setRoleIds(new Integer[] {2});
mockMvc.perform(
diff --git a/scripts/sql/paimon-mysql.sql b/scripts/sql/paimon-mysql.sql
index 83e4f9fc..ebf4f394 100644
--- a/scripts/sql/paimon-mysql.sql
+++ b/scripts/sql/paimon-mysql.sql
@@ -25,7 +25,6 @@ CREATE TABLE if not exists `user`
`mobile` varchar(20) NULL DEFAULT NULL COMMENT 'mobile phone',
`email` varchar(100) NULL DEFAULT NULL COMMENT 'email',
`enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'is enable',
- `is_delete` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'is delete',
`create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'create time',
`update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'update time',
UNIQUE KEY `username` (`username`)
