Commit 758daadc authored by zhaji's avatar zhaji

Merge branch 'develop' into feature-zhaji

parents 450f523f 31910396
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package com.yifu.cloud.plus.v1.yifu.admin.api.entity; package com.yifu.cloud.plus.v1.yifu.admin.api.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
...@@ -135,6 +136,7 @@ public class SysUser extends BaseEntity { ...@@ -135,6 +136,7 @@ public class SysUser extends BaseEntity {
/** /**
* LDAP_DN * LDAP_DN
*/ */
@TableField(exist = false)
@Schema(description = "LDAP_DN") @Schema(description = "LDAP_DN")
private String ldapDn; private String ldapDn;
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
<result column="post" property="post"/> <result column="post" property="post"/>
<result column="email" property="email"/> <result column="email" property="email"/>
<result column="system_flag" property="systemFlag"/> <result column="system_flag" property="systemFlag"/>
<result column="dept_dn" property="ldapDn"/>
<collection property="roleList" ofType="com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysRole" <collection property="roleList" ofType="com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysRole"
select="com.yifu.cloud.plus.v1.yifu.admin.mapper.SysRoleMapper.listRolesByUserId" column="user_id"> select="com.yifu.cloud.plus.v1.yifu.admin.mapper.SysRoleMapper.listRolesByUserId" column="user_id">
</collection> </collection>
...@@ -61,7 +60,6 @@ ...@@ -61,7 +60,6 @@
<result column="post" property="post"/> <result column="post" property="post"/>
<result column="email" property="email"/> <result column="email" property="email"/>
<result column="system_flag" property="systemFlag"/> <result column="system_flag" property="systemFlag"/>
<result column="dept_dn" property="ldapDn"/>
<collection property="roleList" ofType="com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysRole"> <collection property="roleList" ofType="com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysRole">
<id column="role_id" property="roleId"/> <id column="role_id" property="roleId"/>
<result column="role_name" property="roleName"/> <result column="role_name" property="roleName"/>
...@@ -90,7 +88,6 @@ ...@@ -90,7 +88,6 @@
sys_user.post, sys_user.post,
sys_user.email, sys_user.email,
sys_user.system_flag, sys_user.system_flag,
sys_user.dept_dn,
r.role_id, r.role_id,
r.role_name, r.role_name,
r.role_code, r.role_code,
...@@ -115,7 +112,6 @@ ...@@ -115,7 +112,6 @@
sys_user.post, sys_user.post,
sys_user.email, sys_user.email,
sys_user.system_flag, sys_user.system_flag,
sys_user.dept_dn,
r.role_id, r.role_id,
r.role_name, r.role_name,
r.role_code, r.role_code,
...@@ -196,8 +192,7 @@ ...@@ -196,8 +192,7 @@
u.user_group, u.user_group,
u.email, u.email,
u.system_flag, u.system_flag,
d.name AS deptName, d.name AS deptName
u.dept_dn
FROM sys_user u FROM sys_user u
LEFT JOIN sys_dept d ON d.dept_id = u.dept_id LEFT JOIN sys_dept d ON d.dept_id = u.dept_id
<where> <where>
......
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