From f59ade744dbd8602fef7af429620ce85f4138c32 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Thu, 9 Feb 2023 09:27:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/StockTakingController.java          |  2 +-
 .../depository_manage/mapper/StockTakingMapper.xml | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
index a0b23486..dc7b9c8a 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
@@ -206,7 +206,7 @@ public class StockTakingController {
     @GetMapping("/myTask")
     public RestResponse myTask(@RequestParam Map<String,Object> map,HttpServletRequest request) {
         UserByPort userToken= (UserByPort) request.getAttribute("userToken");
-        map.put("userId",userToken.getId());
+        map.put("departmentHead",userToken.getNumber());
         List<SimpleStockTakingP> myTask = stockTakingService.findMyTask(map, request);
         return new RestResponse(myTask,stockTakingService.findMyTaskCount(map),200);
     }
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml
index 62a82a01..cd130a4d 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml
@@ -287,12 +287,10 @@
         from stocktaking st
         where 1 = 1
         <if test='isDone == 0'>
-            and (state = 3 and departmentManagerState = 3 and FIND_IN_SET(#{userId},st.departmentManager) != 0 )
-            or (state = 3 and departmentManagerState != 3 and #{userId} = st.originator)
+            and (state = 3 and departmentManagerState = 3 and FIND_IN_SET(#{departmentHead},st.departmentManager) != 0 )
         </if>
         <if test='isDone == 1'>
-            and (state != 3 and departmentManagerState != 3 and FIND_IN_SET(#{userId},st.departmentManager) != 0 )
-            or (state != 3 and departmentManagerState != 3 and #{userId} = st.originator)
+            and (state != 3 and departmentManagerState != 3 and FIND_IN_SET(#{departmentHead},st.departmentManager) != 0 )
         </if>
         ORDER BY st.createTime desc
         <if test="begin != null and size != null">
@@ -306,12 +304,12 @@
         from stocktaking st
         where 1 = 1
         <if test='isDone == 0'>
-            and (state = 3 and departmentManagerState = 3 and FIND_IN_SET(#{userId},st.departmentManager) != 0 )
-            or (state = 3 and departmentManagerState != 3 and #{userId} = st.originator)
+            and (state = 3 and departmentManagerState = 3 and FIND_IN_SET(#{departmentHead},st.departmentManager) != 0 )
+
         </if>
         <if test='isDone == 1'>
-            and (state != 3 and departmentManagerState != 3 and FIND_IN_SET(#{userId},st.departmentManager) != 0 )
-            or (state != 3 and departmentManagerState != 3 and #{userId} = st.originator)
+            and (state != 3 and departmentManagerState != 3 and FIND_IN_SET(#{departmentHead},st.departmentManager) != 0 )
+
         </if>
 
     </select>