From f229e8120c62df7e5b265b7a781a8f18ef3a4fb9 Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Mon, 8 Jul 2024 16:37:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E6=8A=A5=E5=A1=AB=E6=8A=A5=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=83=A8=E9=97=A8=E6=9F=A5=E8=AF=A2=20=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E9=A1=B9=E7=9B=AEid=E6=9F=A5=E8=AF=A2=E8=A1=A5?=
 =?UTF-8?q?=E4=B8=8A=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml   | 6 ++++--
 .../kehui/project/action/ProjectWeeklyController.java       | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
index 7f85be7..82e2731 100644
--- a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
+++ b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
@@ -41,9 +41,11 @@
         <if test="projectWeekly.weeklyType!=null">
             and pw.weekly_type=#{projectWeekly.weeklyType}
         </if>
-        <if test="projectWeekly.projectId">
+        <if test="projectWeekly.projectId!=null">
             and pw.project_id=#{projectWeekly.projectId}
         </if>
-
+        <if test="projectWeekly.deptId!=null">
+            and pw.dept_id=#{projectWeekly.deptId}
+        </if>
     </select>
 </mapper>
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
index 96d3cb6..6df5ebc 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
@@ -124,6 +124,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
                 projectWeekly.setUserId(String.valueOf(userId));
                 projectWeekly.setWeeklyType("0");
                 if(!StringUtils.isEmpty(projectWeeklyFindReq.getId()!=null))projectWeekly.setId(projectWeeklyFindReq.getId());
+                if(!StringUtils.isEmpty(projectWeeklyFindReq.getDeptId()!=null))projectWeekly.setDeptId(projectWeeklyFindReq.getDeptId());
                 List<ProjectWeeklyDto> list = projectWeeklyService.getList(page, projectWeekly);
 
                 //判断当前账号是否是项目专员/负责人
@@ -143,6 +144,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
                     projectWeekly1.setWeeklyType("0");
                     projectWeekly1.setProjectId(weekly.getProjectId());
                     if(!StringUtils.isEmpty(projectWeeklyFindReq.getId()!=null))projectWeekly1.setId(projectWeeklyFindReq.getId());
+                    if(!StringUtils.isEmpty(projectWeeklyFindReq.getDeptId()!=null))projectWeekly.setDeptId(projectWeeklyFindReq.getDeptId());
                     list.addAll(projectWeeklyService.getList(page, projectWeekly1));
                 }