接口修改

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

@@ -1,5 +1,8 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dao.EmployeeDao;
 import com.yonge.cooleshow.biz.dal.dto.search.EmployeeSearch;
 import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -27,16 +30,19 @@ import com.yonge.cooleshow.common.controller.BaseController;
 @Api(tags = "员工管理")
 @RestController
 public class EmployeeController extends BaseController {
-
     @Autowired
     private EmployeeService employeeService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private EmployeeDao employeeDao;
 
     @GetMapping("/detail/{userId}")
     @ApiOperation(value = "详情", notes = "传入student")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "userId", value = "userId", paramType = "path", dataType = "long", required = true),
     })
-    public HttpResponseResult<Employee> detail(Long userId) throws Exception{
+    public HttpResponseResult<Employee> detail(Long userId){
         Employee detail = employeeService.detail(userId);
         return succeed(detail);
     }
@@ -73,7 +79,7 @@ public class EmployeeController extends BaseController {
         return succeed(employeeService.findAll(null));
     }*/
 
-    /*@ApiOperation(value = "获取用户信息")
+    @ApiOperation(value = "获取用户信息")
     @GetMapping("/queryUserInfo")
     public Object apiQueryUserInfo() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -85,6 +91,6 @@ public class EmployeeController extends BaseController {
             return succeed(employee);
         }
         return failed("获取用户信息失败");
-    }*/
+    }
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/EmployeeDao.java

@@ -72,7 +72,13 @@ public interface EmployeeDao extends BaseDAO<Long, Employee> {
      * @return: com.yonge.cooleshow.auth.api.entity.SysUser
      */
     SysUser querySysUserByPhone(@Param("phone") String phone);
-
+    /**
+     * 获取用户权限列表
+     *
+     * @param userId
+     * @return
+     */
+    List<Long> queryUserRole(Long userId);
 
     /**
      * @Author: Joburgess
@@ -90,13 +96,7 @@ public interface EmployeeDao extends BaseDAO<Long, Employee> {
     SysUser queryByPhone(String phone);
 
 
-    /**
-     * 获取用户权限列表
-     *
-     * @param userId
-     * @return
-     */
-    List<Long> queryUserRole(Long userId);
+
 
     /**
      * 获取用户信息

cooleshow-user/user-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -248,7 +248,9 @@
 		select * from sys_user where phone_ = #{phone} OR username_ = #{phone} LIMIT 1 FOR UPDATE
 	</select>
 
-
+    <select id="queryUserRole" resultType="java.lang.Long">
+        SELECT sur.role_id_ FROM sys_user_role sur WHERE sur.user_id_ = #{userId}
+    </select>
 
 
 
@@ -304,9 +306,7 @@
 		SELECT COUNT(*) FROM employee where tenant_id_ = #{tenantId}
 	</select>
 
-    <select id="queryUserRole" resultType="java.lang.Long">
-        SELECT sur.role_id_ FROM sys_user_role sur WHERE sur.user_id_ = #{userId}
-    </select>
+
 
     <select id="getUsers" resultMap="SysUser">
         select * from sys_user where id_ IN