vernedeng commented on code in PR #8119:
URL: https://github.com/apache/inlong/pull/8119#discussion_r1212493197
##########
inlong-manager/manager-dao/src/main/resources/mappers/TenantUserRoleEntityMapper.xml:
##########
@@ -33,32 +34,50 @@
<result column="version" jdbcType="INTEGER" property="version"/>
</resultMap>
<sql id="Base_Column_List">
- id, user_name, role_code, disabled, is_deleted, creator, modifier,
create_time, modify_time, version
+ id, user_name, role_code, tenant, disabled, is_deleted, creator,
modifier, create_time, modify_time, version
</sql>
<insert id="insert" useGeneratedKeys="true" keyProperty="id"
-
parameterType="org.apache.inlong.manager.dao.entity.UserRoleEntity">
- insert into user_role (id, user_name, role_code,
+
parameterType="org.apache.inlong.manager.dao.entity.TenantUserRoleEntity">
+ insert into tenant_user_role (id, user_name, role_code, tenant,
disabled, creator, modifier)
values (#{id,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR},
#{roleCode,jdbcType=VARCHAR},
- #{disabled,jdbcType=SMALLINT}, #{creator,jdbcType=VARCHAR},
#{modifier,jdbcType=VARCHAR})
+ #{tenant,jdbcType=VARCHAR},#{disabled,jdbcType=SMALLINT},
+ #{creator,jdbcType=VARCHAR}, #{modifier,jdbcType=VARCHAR})
</insert>
<select id="selectById" parameterType="java.lang.Integer"
resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
- from user_role
+ from tenant_user_role
where id = #{id,jdbcType=INTEGER}
</select>
- <select id="listByUsername" parameterType="java.lang.String"
resultMap="BaseResultMap">
- select
+ <select id="listByCondition"
+
parameterType="org.apache.inlong.manager.pojo.user.TenantRolePageRequest"
+ resultMap="BaseResultMap">
+ select
<include refid="Base_Column_List"/>
- from user_role
- where user_name = #{username,jdbcType=VARCHAR}
+ from tenant_user_role
+ where
+ is_deleted = 0
Review Comment:
fixed, thx
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
