getInfo判空，获取分管领导

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

@@ -74,25 +74,27 @@ public class CmcCarApprovalController extends BaseController
     {
         JSONObject formData = new JSONObject();
         CmcCarApproval cmcCarApproval = cmcCarApprovalService.selectCmcCarApprovalByCarApplyId(carApplyId);
-        formData.put("user", userService.selectUserById(cmcCarApproval.getApplier()).getNickName());
-        formData.put("deptName", deptService.selectDeptById(userService.selectUserById(cmcCarApproval.getApplier()).getDeptId()).getDeptName());
-        formData.put("date", cmcCarApproval.getApplyDate());
-        formData.put("startTime", cmcCarApproval.getBeginDate());
-        formData.put("endTime", cmcCarApproval.getEndDate());
-        formData.put("day", cmcCarApproval.getDays());
-        formData.put("passengers", cmcCarApproval.getPassengers());
-        formData.put("projectNumber", cmcCarApproval.getProjectId());
-        formData.put("applyReason", cmcCarApproval.getApplyReason());
-        formData.put("deptUser", cmcCarApproval.getDeptUserId());
-        formData.put("deptComment", cmcCarApproval.getDeptComment());
-        formData.put("managerUser", cmcCarApproval.getManagerUserId());
-        formData.put("managerComment", cmcCarApproval.getManagerComment());
-        formData.put("unionUser", cmcCarApproval.getUnionUserId());
-        formData.put("unionComment", cmcCarApproval.getUnionComment());
-        formData.put("dispatcher", cmcCarApproval.getDispatcher());
-        formData.put("dispatchComment", cmcCarApproval.getDispatchComment());
-        formData.put("cars", cmcCarApproval.getCars());
-        formData.put("drivers", cmcCarApproval.getDrivers());
+        if (cmcCarApproval != null) {
+            formData.put("user", userService.selectUserById(cmcCarApproval.getApplier()).getNickName());
+            formData.put("deptName", deptService.selectDeptById(userService.selectUserById(cmcCarApproval.getApplier()).getDeptId()).getDeptName());
+            formData.put("date", cmcCarApproval.getApplyDate());
+            formData.put("startTime", cmcCarApproval.getBeginDate());
+            formData.put("endTime", cmcCarApproval.getEndDate());
+            formData.put("day", cmcCarApproval.getDays());
+            formData.put("passengers", cmcCarApproval.getPassengers());
+            formData.put("projectNumber", cmcCarApproval.getProjectId());
+            formData.put("applyReason", cmcCarApproval.getApplyReason());
+            formData.put("deptUser", cmcCarApproval.getDeptUserId());
+            formData.put("deptComment", cmcCarApproval.getDeptComment());
+            formData.put("managerUser", cmcCarApproval.getManagerUserId());
+            formData.put("managerComment", cmcCarApproval.getManagerComment());
+            formData.put("unionUser", cmcCarApproval.getUnionUserId());
+            formData.put("unionComment", cmcCarApproval.getUnionComment());
+            formData.put("dispatcher", cmcCarApproval.getDispatcher());
+            formData.put("dispatchComment", cmcCarApproval.getDispatchComment());
+            formData.put("cars", cmcCarApproval.getCars());
+            formData.put("drivers", cmcCarApproval.getDrivers());
+        }
         return success(formData);
     }
 

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

@@ -74,21 +74,23 @@ public class CmcDeviceApprovalController extends BaseController
     {
         JSONObject formData = new JSONObject();
         CmcDeviceApproval cmcDeviceApproval = cmcDeviceApprovalService.selectCmcDeviceApprovalByDeviceApplyId(deviceApplyId);
-        formData.put("user", userService.selectUserById(cmcDeviceApproval.getApplier()).getNickName());
-        formData.put("deptName", deptService.selectDeptById(userService.selectUserById(cmcDeviceApproval.getApplier()).getDeptId()).getDeptName());
-        formData.put("date", cmcDeviceApproval.getApplyDate());
-        formData.put("startTime", cmcDeviceApproval.getBeginDate());
-        formData.put("endTime", cmcDeviceApproval.getEndDate());
-        formData.put("day", cmcDeviceApproval.getDays());
-        formData.put("projectNumber", cmcDeviceApproval.getProjectId());
-        formData.put("applyReason", cmcDeviceApproval.getApplyReason());
-        formData.put("deptUser", cmcDeviceApproval.getDeptUserId());
-        formData.put("deptComment", cmcDeviceApproval.getDeptComment());
-        formData.put("managerUser", cmcDeviceApproval.getManagerUserId());
-        formData.put("managerComment", cmcDeviceApproval.getManagerComment());
-        formData.put("dispatcher", cmcDeviceApproval.getDispatcher());
-        formData.put("dispatchComment", cmcDeviceApproval.getDispatchComment());
-        formData.put("devices", cmcDeviceApproval.getDevices());
+        if (cmcDeviceApproval != null) {
+            formData.put("user", userService.selectUserById(cmcDeviceApproval.getApplier()).getNickName());
+            formData.put("deptName", deptService.selectDeptById(userService.selectUserById(cmcDeviceApproval.getApplier()).getDeptId()).getDeptName());
+            formData.put("date", cmcDeviceApproval.getApplyDate());
+            formData.put("startTime", cmcDeviceApproval.getBeginDate());
+            formData.put("endTime", cmcDeviceApproval.getEndDate());
+            formData.put("day", cmcDeviceApproval.getDays());
+            formData.put("projectNumber", cmcDeviceApproval.getProjectId());
+            formData.put("applyReason", cmcDeviceApproval.getApplyReason());
+            formData.put("deptUser", cmcDeviceApproval.getDeptUserId());
+            formData.put("deptComment", cmcDeviceApproval.getDeptComment());
+            formData.put("managerUser", cmcDeviceApproval.getManagerUserId());
+            formData.put("managerComment", cmcDeviceApproval.getManagerComment());
+            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

@@ -1,11 +1,13 @@
 package com.ruoyi.web.controller.system;
 
+import java.util.Arrays;
+import java.util.Iterator;
 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;
@@ -38,6 +40,9 @@ public class SysPostController extends BaseController
     @Autowired
     private ISysPostService postService;
 
+    @Autowired
+    private ISysUserService userService;
+
     /**
      * 获取岗位列表
      */
@@ -77,8 +82,23 @@ public class SysPostController extends BaseController
     @GetMapping("/manageLeader")
     public AjaxResult getManageLeader(String userId)
     {
-        SysUser sysUser = new SysUser();
-        return success(sysUser);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("2", Arrays.asList(103,105,113));
+        jsonObject.put("7", Arrays.asList(104, 112, 116));
+        jsonObject.put("9", Arrays.asList(108, 109));
+        jsonObject.put("10", Arrays.asList(110, 111));
+        jsonObject.put("11", Arrays.asList(160, 107));
+        jsonObject.put("12", Arrays.asList(117));
+        jsonObject.put("13", Arrays.asList(114, 115));
+        Iterator<String> iterator = jsonObject.keySet().iterator();
+        String manageId = "";
+        while(iterator.hasNext()){
+            String key = (String) iterator.next();
+            List<Long> value = jsonObject.getList(key, Long.class);
+            if (value.contains(userService.selectUserById(Long.parseLong(userId)).getDeptId()))
+                manageId = key;
+        }
+        return success(manageId);
     }
 
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)

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

@@ -59,12 +59,4 @@ public interface SysUserPostMapper
      * @return 查询部门主任
      */
     public SysUser selectDeptLeaderByUserId(String userId);
-
-    /**
-     * 查询分管领导
-     *
-     * @param
-     * @return 查询分管领导
-     */
-    public List<SysUser> selectManageLeaderList();
 }

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

@@ -115,12 +115,4 @@ public interface ISysPostService
      * @return 查询部门主任
      */
     public SysUser selectDeptLeaderByUserId(String userId);
-
-    /**
-     * 查询分管领导
-     *
-     * @param
-     * @return 查询分管领导
-     */
-    public List<SysUser> selectManageLeaderList();
 }

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

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

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

@@ -29,12 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where up.post_id = 12
 	</select>
 
-	<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>
-
 	<delete id="deleteUserPostByUserId" parameterType="Long">
 		delete from sys_user_post where user_id=#{userId}
 	</delete>