员工信息查询接口修改

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/EmployeeController.java

@@ -87,7 +87,9 @@ public class EmployeeController extends BaseController {
         if (sysUser != null && sysUser.getId() != null) {
             Employee employee = employeeService.get(sysUser.getId());
             EmployeeVo employeeVo = new EmployeeVo().buildVo(employee);
+            employeeVo.setUserId(sysUser.getId());
             employeeVo.setRoleIds(employeeDao.queryUserRole(sysUser.getId()));
+            employeeVo.setSysUser(sysUser);
 
             BeanUtils.copyProperties(sysUser, employeeVo, "gender");
             employeeVo.setGender(GenderEnum.valueOf(sysUser.getGender()));
@@ -95,5 +97,4 @@ public class EmployeeController extends BaseController {
         }
         return failed("获取用户信息失败");
     }
-
-}
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/EmployeeVo.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
+import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.Employee;
 import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import com.yonge.cooleshow.biz.dal.enums.UserLockFlag;
@@ -28,7 +29,8 @@ public class EmployeeVo extends Employee {
     private UserLockFlag lockFlag;
     @ApiModelProperty(value = "角色id列表")
     private List<Long> roleIds;
-
+    @ApiModelProperty(value = "用户对象")
+    private SysUser sysUser;
     public String getUsername() {
         return username;
     }
@@ -77,7 +79,18 @@ public class EmployeeVo extends Employee {
         this.avatar = avatar;
     }
 
+    public SysUser getSysUser() {
+        return sysUser;
+    }
+
+    public void setSysUser(SysUser sysUser) {
+        this.sysUser = sysUser;
+    }
+
     public EmployeeVo buildVo(Employee employee) {
+        if(null == employee){
+            return new EmployeeVo();
+        }
         try {
             BeanUtils.copyProperties(this, employee);
         } catch (Exception e) {