员工详情接口修改

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -313,6 +313,7 @@ public class UserController extends BaseController {
                     return failed("手机号被占用");
                 }
             }
+            sysUser.setIsSuperAdmin(null);
             sysUserService.updateBaseInfo(sysUser);
             return succeed();
         }

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

@@ -51,14 +51,13 @@ public interface EmployeeDao extends BaseDAO<Long, Employee> {
      * @return: long
      */
     int updateSysUser(SysUser user);
-
     /**
-     * 删除用户角色
+     * 获取用户权限列表
      *
      * @param userId
+     * @return
      */
-    void delEmployeeRole(Long userId);
-
+    List<Long> queryUserRole(Long userId);
     /**
      * 批量新增用户角色
      *
@@ -66,7 +65,12 @@ public interface EmployeeDao extends BaseDAO<Long, Employee> {
      * @param roleIds
      */
     void batchAddEmployeeRole(@Param("userId") Long id, @Param("roleIds") List<Long> roleIds);
-
+    /**
+     * 删除用户角色
+     *
+     * @param userId
+     */
+    void delEmployeeRole(Long userId);
     /***
      * 通过手机号查询用户
      * @author liweifan
@@ -89,15 +93,6 @@ public interface EmployeeDao extends BaseDAO<Long, Employee> {
      * @return
      */
     SysUser querySysUserById(@Param("id") Long id);
-
-    /**
-     * 获取用户权限列表
-     *
-     * @param userId
-     * @return
-     */
-    List<Long> queryUserRole(Long userId);
-
     /**
      * @Author: Joburgess
      * @Date: 2019/9/25

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SubjectService.java

@@ -4,7 +4,6 @@ import java.util.List;
 
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.queryInfo.SubjectQueryInfo;
-import com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.cooleshow.common.service.BaseService;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/EmployeeServiceImpl.java

@@ -44,7 +44,11 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Long, Employee> impleme
 
     @Override
     public EmployeeVo detail(Long id) {
-        return employeeDao.detail(id);
+        EmployeeVo detail = employeeDao.detail(id);
+        //用户角色
+        List<Long> longs = employeeDao.queryUserRole(id);
+        detail.setRoleIds(longs);
+        return detail;
     }
 
     @Override
@@ -90,7 +94,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Long, Employee> impleme
     public HttpResponseResult<EmployeeDto> updateEmployee(EmployeeDto param) throws Exception {
         SysUser sysUser = employeeDao.querySysUserById(param.getUserId());
         Employee employee = employeeDao.get(sysUser.getId());
-        if(null == sysUser || null == employee){
+        if (null == sysUser || null == employee) {
             return HttpResponseResult.failed("未找到用户");
         }
         SysUser oldPhoneUser = employeeDao.querySysUserByPhone(param.getPhone());

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

@@ -1,21 +0,0 @@
-package com.yonge.cooleshow.biz.dal.vo;
-
-import com.yonge.cooleshow.biz.dal.entity.Subject;
-
-import java.util.List;
-
-/**
- * @Author: liweifan
- * @Data: 2022/3/21 17:18
- */
-public class SubjectSelectVo extends Subject {
-    private List<SubjectSelectVo> children;
-
-    public List<SubjectSelectVo> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<SubjectSelectVo> children) {
-        this.children = children;
-    }
-}

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

@@ -228,12 +228,18 @@
         WHERE user_id_ = #{userId}
     </update>
 
+    <select id="queryUserRole" resultType="java.lang.Long">
+        SELECT sur.role_id_ FROM sys_user_role sur WHERE sur.user_id_ = #{userId}
+    </select>
     <insert id="batchAddEmployeeRole">
         INSERT INTO sys_user_role(user_id_,role_id_) values
         <foreach collection="roleIds" item="item" index="index" separator=",">
             (#{userId},#{item})
         </foreach>
     </insert>
+    <delete id="delEmployeeRole">
+        DELETE FROM sys_user_role WHERE user_id_ = #{userId}
+    </delete>
 
     <insert id="batchInsertRoleMenu">
         INSERT INTO sys_role_menu (role_id_,menu_id_) VALUES
@@ -254,9 +260,9 @@
 		select * from sys_user where id_ = #{id}
 	</select>
 
-    <select id="queryUserRole" resultType="java.lang.Long">
-        SELECT sur.role_id_ FROM sys_user_role sur WHERE sur.user_id_ = #{userId}
-    </select>
+    <update id="updateUserDemissionDate">
+        UPDATE employee SET demission_date_ = IF(demission_date_ IS NULL,now(),NULL) WHERE user_id_=#{userID}
+    </update>
 
 
     <!-- 根据主键查询一条记录 -->
@@ -286,23 +292,15 @@
                 #{updateTime}, #{delFlag}, #{organId}, #{tenantId});
     </insert>
 
-
-
     <update id="updatePasswordReq">
         UPDATE sys_user SET password_ = #{password} WHERE id_ = #{userID}
     </update>
 
-    <update id="updateUserDemissionDate">
-        UPDATE employee SET demission_date_ = IF(demission_date_ IS NULL,now(),NULL) WHERE user_id_=#{userID}
-    </update>
-
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
 		DELETE FROM employee WHERE user_id_ = #{userId}
 	</delete>
-    <delete id="delEmployeeRole">
-        DELETE FROM sys_user_role WHERE user_id_ = #{userId}
-    </delete>
+
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/StudentController.java

@@ -2,8 +2,8 @@ package com.yonge.cooleshow.student.controller;
 
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.vo.StudentHomeVo;
-import com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.utils.string.StringUtil;
@@ -51,7 +51,7 @@ public class StudentController extends BaseController {
 
     @ApiOperation(value = "设置声部")
     @GetMapping("/setSubject")
-    public HttpResponseResult<List<SubjectSelectVo>> setSubject(@ApiParam(value = "声部主键集合", required = true) @RequestParam("subjectIds") String subjectIds) {
+    public HttpResponseResult setSubject(@ApiParam(value = "声部主键集合", required = true) @RequestParam("subjectIds") String subjectIds) {
         if (StringUtil.isEmpty(subjectIds)) {
             return failed("参数不能为空");
         }

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/SubjectController.java

@@ -1,18 +1,13 @@
 package com.yonge.cooleshow.student.controller;
 
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.service.SubjectService;
-import com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/SubjectController.java

@@ -13,9 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.yonge.cooleshow.biz.dal.queryInfo.SubjectQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.SubjectService;
-import com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherController.java

@@ -4,7 +4,6 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.service.TeacherService;
-import com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -59,7 +58,7 @@ public class TeacherController extends BaseController {
 
     @ApiOperation(value = "设置声部")
     @GetMapping("/setSubject")
-    public HttpResponseResult<List<SubjectSelectVo>> setSubject(@ApiParam(value = "声部主键集合", required = true) @RequestParam("subjectIds") String subjectIds) {
+    public HttpResponseResult setSubject(@ApiParam(value = "声部主键集合", required = true) @RequestParam("subjectIds") String subjectIds) {
         if (StringUtil.isEmpty(subjectIds)) {
             return failed("参数不能为空");
         }