审批表存userId

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarApprovalController.java

@@ -83,13 +83,13 @@ public class CmcCarApprovalController extends BaseController
         formData.put("passengers", cmcCarApproval.getPassengers());
         formData.put("projectNumber", cmcCarApproval.getProjectId());
         formData.put("applyReason", cmcCarApproval.getApplyReason());
-        formData.put("deptUser", userService.selectUserById(cmcCarApproval.getDeptUserId()).getNickName());
+        formData.put("deptUser", cmcCarApproval.getDeptUserId());
         formData.put("deptComment", cmcCarApproval.getDeptComment());
-        formData.put("managerUser", userService.selectUserById(cmcCarApproval.getManagerUserId()).getNickName());
+        formData.put("managerUser", cmcCarApproval.getManagerUserId());
         formData.put("managerComment", cmcCarApproval.getManagerComment());
-        formData.put("unionUser", userService.selectUserById(cmcCarApproval.getUnionUserId()).getNickName());
+        formData.put("unionUser", cmcCarApproval.getUnionUserId());
         formData.put("unionComment", cmcCarApproval.getUnionComment());
-        formData.put("dispatcher", userService.selectUserById(cmcCarApproval.getDispatcher()).getNickName());
+        formData.put("dispatcher", cmcCarApproval.getDispatcher());
         formData.put("dispatchComment", cmcCarApproval.getDispatchComment());
         formData.put("cars", cmcCarApproval.getCars());
         formData.put("drivers", cmcCarApproval.getDrivers());

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java

@@ -82,11 +82,11 @@ public class CmcDeviceApprovalController extends BaseController
         formData.put("day", cmcDeviceApproval.getDays());
         formData.put("projectNumber", cmcDeviceApproval.getProjectId());
         formData.put("applyReason", cmcDeviceApproval.getApplyReason());
-        formData.put("deptUser", userService.selectUserById(cmcDeviceApproval.getDeptUserId()).getNickName());
+        formData.put("deptUser", cmcDeviceApproval.getDeptUserId());
         formData.put("deptComment", cmcDeviceApproval.getDeptComment());
-        formData.put("managerUser", userService.selectUserById(cmcDeviceApproval.getManagerUserId()).getNickName());
+        formData.put("managerUser", cmcDeviceApproval.getManagerUserId());
         formData.put("managerComment", cmcDeviceApproval.getManagerComment());
-        formData.put("dispatcher", userService.selectUserById(cmcDeviceApproval.getDispatcher()).getNickName());
+        formData.put("dispatcher", cmcDeviceApproval.getDispatcher());
         formData.put("dispatchComment", cmcDeviceApproval.getDispatchComment());
         formData.put("devices", cmcDeviceApproval.getDevices());
         return success(formData);

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -3,8 +3,9 @@ package com.ruoyi.web.controller.system;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -76,8 +77,8 @@ public class SysPostController extends BaseController
     @GetMapping("/manageLeader")
     public AjaxResult getManageLeader(String userId)
     {
-        SysUser manageLeader = postService.selectManageLeaderByUserId(userId);
-        return success(manageLeader);
+        SysUser sysUser = new SysUser();
+        return success(sysUser);
     }
 
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java

@@ -66,5 +66,5 @@ public interface SysUserPostMapper
      * @param
      * @return 查询分管领导
      */
-    public SysUser selectManageLeaderByUserId(String userId);
+    public List<SysUser> selectManageLeaderList();
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

@@ -122,6 +122,5 @@ public interface ISysPostService
      * @param
      * @return 查询分管领导
      */
-    public SysUser selectManageLeaderByUserId(String userId);
-
+    public List<SysUser> selectManageLeaderList();
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

@@ -207,5 +207,5 @@ public class SysPostServiceImpl implements ISysPostService
      * @return 查询分管领导
      */
     @Override
-    public SysUser selectManageLeaderByUserId(String userId) { return userPostMapper.selectManageLeaderByUserId(userId); }
+    public List<SysUser> selectManageLeaderList() { return userPostMapper.selectManageLeaderList(); }
 }

oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -16,8 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectDriverList" resultMap="SysUserResult">
 		select u.user_id, u.nick_name
-		from sys_user u
-				 left join sys_user_post up on u.user_id = up.user_id
+		from sys_user u left join sys_user_post up on u.user_id = up.user_id
 		where up.post_id = 27
 	</select>
 
@@ -30,12 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where up.post_id = 12
 	</select>
 
-	<select id="selectManageLeaderByUserId" parameterType="String" resultMap="SysUserResult">
-		select r.user_id, r.nick_name, up.post_id from
-		(select u1.user_id, u1.nick_name, u.dept_id from
-		sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id) as r
-		left join sys_user_post as up
-		on r.user_id = up.user_id
+	<select id="selectManageLeaderList" resultMap="SysUserResult">
+		select u.user_id, u.nick_name
+		from sys_user u left join sys_user_post up on u.user_id = up.user_id
 		where up.post_id = 6
 	</select>