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 map,HttpServletRequest request) { UserByPort userToken= (UserByPort) request.getAttribute("userToken"); - map.put("userId",userToken.getId()); + map.put("departmentHead",userToken.getNumber()); List 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 - 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 ) - 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 ) ORDER BY st.createTime desc @@ -306,12 +304,12 @@ from stocktaking st where 1 = 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 ) + - 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 ) +