Commit 0fe1874a authored by hongguangwu's avatar hongguangwu

1.5.8-hgw-权限-角色-账号

parent 3f62427f
...@@ -53,6 +53,7 @@ public class SysUserPermission extends BaseEntity { ...@@ -53,6 +53,7 @@ public class SysUserPermission extends BaseEntity {
/** /**
* 权限类型 * 权限类型
* 1客户权限;2商机;3报价单;4合同;5项目;6BU;7条线;8部门;9收入归属
*/ */
@Schema(description = "权限类型") @Schema(description = "权限类型")
private String permissionType; private String permissionType;
......
...@@ -81,9 +81,6 @@ ...@@ -81,9 +81,6 @@
<if test="sysUserInfo.status != null"> <if test="sysUserInfo.status != null">
AND a.status = #{sysUserInfo.status} AND a.status = #{sysUserInfo.status}
</if> </if>
<if test="sysUserInfo.roleNames != null and sysUserInfo.roleNames.trim() != ''">
AND r.role_name like concat('%',#{sysUserInfo.roleNames},'%')
</if>
<if test="sysUserInfo.createBy != null and sysUserInfo.createBy.trim() != ''"> <if test="sysUserInfo.createBy != null and sysUserInfo.createBy.trim() != ''">
AND a.CREATE_BY = #{sysUserInfo.createBy} AND a.CREATE_BY = #{sysUserInfo.createBy}
</if> </if>
...@@ -103,6 +100,22 @@ ...@@ -103,6 +100,22 @@
</sql> </sql>
<!--sysUserInfo简单分页查询--> <!--sysUserInfo简单分页查询-->
<select id="getSysUserInfoPage" resultMap="sysUserInfoMap"> <select id="getSysUserInfoPage" resultMap="sysUserInfoMap">
SELECT
a.fd_id,
a.fd_name,
a.fd_login_name,
a.fd_ldap_dn,
a.fd_dept_name,
a.fd_mobile_no,
a.fd_email,
a.status,
a.role_names,
a.CREATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_BY,
a.UPDATE_TIME
from (
SELECT SELECT
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM sys_user_info a FROM sys_user_info a
...@@ -113,8 +126,13 @@ ...@@ -113,8 +126,13 @@
<include refid="sysUserInfo_where"/> <include refid="sysUserInfo_where"/>
</where> </where>
GROUP BY a.fd_id GROUP BY a.fd_id
) a
<if test="sysUserInfo != null">
<if test="sysUserInfo.roleNames != null and sysUserInfo.roleNames.trim() != ''">
AND a.role_names like concat('%',#{sysUserInfo.roleNames},'%')
</if>
</if>
order by a.CREATE_TIME desc order by a.CREATE_TIME desc
</select> </select>
<!--list--> <!--list-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment