@@ -1,21 +1,5 @@ | |||||
package com.ruoyi.web.controller.system; | package com.ruoyi.web.controller.system; | ||||
import java.util.List; | |||||
import java.util.stream.Collectors; | |||||
import javax.servlet.http.HttpServletResponse; | |||||
import org.apache.commons.lang3.ArrayUtils; | |||||
import org.springframework.beans.factory.annotation.Autowired; | |||||
import org.springframework.security.access.prepost.PreAuthorize; | |||||
import org.springframework.validation.annotation.Validated; | |||||
import org.springframework.web.bind.annotation.DeleteMapping; | |||||
import org.springframework.web.bind.annotation.GetMapping; | |||||
import org.springframework.web.bind.annotation.PathVariable; | |||||
import org.springframework.web.bind.annotation.PostMapping; | |||||
import org.springframework.web.bind.annotation.PutMapping; | |||||
import org.springframework.web.bind.annotation.RequestBody; | |||||
import org.springframework.web.bind.annotation.RequestMapping; | |||||
import org.springframework.web.bind.annotation.RestController; | |||||
import org.springframework.web.multipart.MultipartFile; | |||||
import com.ruoyi.common.annotation.Log; | import com.ruoyi.common.annotation.Log; | ||||
import com.ruoyi.common.core.controller.BaseController; | import com.ruoyi.common.core.controller.BaseController; | ||||
import com.ruoyi.common.core.domain.AjaxResult; | import com.ruoyi.common.core.domain.AjaxResult; | ||||
@@ -31,10 +15,20 @@ import com.ruoyi.system.service.ISysDeptService; | |||||
import com.ruoyi.system.service.ISysPostService; | import com.ruoyi.system.service.ISysPostService; | ||||
import com.ruoyi.system.service.ISysRoleService; | import com.ruoyi.system.service.ISysRoleService; | ||||
import com.ruoyi.system.service.ISysUserService; | import com.ruoyi.system.service.ISysUserService; | ||||
import org.apache.commons.lang3.ArrayUtils; | |||||
import org.springframework.beans.factory.annotation.Autowired; | |||||
import org.springframework.security.access.prepost.PreAuthorize; | |||||
import org.springframework.validation.annotation.Validated; | |||||
import org.springframework.web.bind.annotation.*; | |||||
import org.springframework.web.multipart.MultipartFile; | |||||
import javax.servlet.http.HttpServletResponse; | |||||
import java.util.List; | |||||
import java.util.stream.Collectors; | |||||
/** | /** | ||||
* 用户信息 | * 用户信息 | ||||
* | |||||
* | |||||
* @author ruoyi | * @author ruoyi | ||||
*/ | */ | ||||
@RestController | @RestController | ||||
@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | |||||
<result property="deptName" column="dept_name" /> | <result property="deptName" column="dept_name" /> | ||||
<result property="ancestors" column="ancestors" /> | <result property="ancestors" column="ancestors" /> | ||||
<result property="orderNum" column="order_num" /> | <result property="orderNum" column="order_num" /> | ||||
<result property="importCode" column="import_code" /> | |||||
<result property="leader" column="leader" /> | <result property="leader" column="leader" /> | ||||
<result property="status" column="dept_status" /> | <result property="status" column="dept_status" /> | ||||
</resultMap> | </resultMap> | ||||
@@ -49,7 +50,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.pwd_update_date, u.create_by, u.create_time, u.remark, | 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.pwd_update_date, u.create_by, u.create_time, u.remark, | ||||
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, | |||||
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.import_code, 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 | ||||