公司加属性
This commit is contained in:
parent
a24a6f8e86
commit
0508383e8d
|
|
@ -119,7 +119,13 @@ public class SysUserServiceImpl implements ISysUserService {
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public SysUser selectUserByUserName(String userName) {
|
public SysUser selectUserByUserName(String userName) {
|
||||||
return userMapper.selectUserByUserName(userName);
|
SysUser sysUser = userMapper.selectUserByUserName(userName);
|
||||||
|
SysDept sysDept = deptMapper.selectDeptById(sysUser.getCompanyId());
|
||||||
|
if (Objects.nonNull(sysUser.getDept()) && Objects.nonNull(sysDept)) {
|
||||||
|
sysUser.getDept().setSocialCreditCode(sysDept.getSocialCreditCode());
|
||||||
|
sysUser.getDept().setEnterpriseOwnershipCode(sysDept.getEnterpriseOwnershipCode());
|
||||||
|
}
|
||||||
|
return sysUser;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -36,8 +36,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<result property="orderNum" column="order_num" />
|
<result property="orderNum" column="order_num" />
|
||||||
<result property="leader" column="leader" />
|
<result property="leader" column="leader" />
|
||||||
<result property="status" column="dept_status" />
|
<result property="status" column="dept_status" />
|
||||||
<result property="socialCreditCode" column="social_credit_code" />
|
|
||||||
<result property="enterpriseOwnershipCode" column="enterprise_ownership_code" />
|
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<resultMap id="RoleResult" type="com.bonus.sgzb.system.api.domain.SysRole">
|
<resultMap id="RoleResult" type="com.bonus.sgzb.system.api.domain.SysRole">
|
||||||
|
|
@ -51,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
|
||||||
<sql id="selectUserVo">
|
<sql id="selectUserVo">
|
||||||
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.company_id,
|
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.company_id,
|
||||||
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, d.social_credit_code as socialCreditCode,d.enterprise_ownership_code as enterpriseOwnershipCode,
|
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
|
||||||
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
|
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
|
||||||
from sys_user u
|
from sys_user u
|
||||||
left join sys_dept d on u.dept_id = d.dept_id
|
left join sys_dept d on u.dept_id = d.dept_id
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue