diff --git a/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java b/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java
index 9599786..92a9084 100644
--- a/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java
+++ b/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java
@@ -84,15 +84,15 @@ public class ProjectInitListener implements ExecutionListener {
                     //根据部门批量添加部门周报填报
                     JSONArray depts = (JSONArray) ext.get("executeDepts");
                     ArrayList<ProjectWeekly> weeklyArrayList = new ArrayList<>();
-                    if (!ObjectUtils.isEmpty(depts)) {
-                        depts.forEach(a -> {
-                            ProjectWeekly projectWeekly = new ProjectWeekly();
-                            projectWeekly.setProjectId(String.valueOf(projectInfo.getId()));
-                            projectWeekly.setWeeklyType("1");
-                            projectWeekly.setCreatedAt(new Timestamp(System.currentTimeMillis()));
-                            projectWeekly.setDeptId(a.toString());
-                            weeklyArrayList.add(projectWeekly);
-                        });
+                   if (!ObjectUtils.isEmpty(depts)) {
+//                        depts.forEach(a -> {
+//                            ProjectWeekly projectWeekly = new ProjectWeekly();
+//                            projectWeekly.setProjectId(String.valueOf(projectInfo.getId()));
+//                            projectWeekly.setWeeklyType("1");
+//                            projectWeekly.setCreatedAt(new Timestamp(System.currentTimeMillis()));
+//                            projectWeekly.setDeptId(a.toString());
+//                            weeklyArrayList.add(projectWeekly);
+//                        });
 
                         //添加项目专员/负责人假数据，方便周报填报页面查看所有（暂时）
                         String draftManId = String.valueOf(ext.get("draftManId"));
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 4cd7494..944e146 100644
--- a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
+++ b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
@@ -63,6 +63,9 @@
         <if test="projectWeekly.Id!=null">
             and pw.id_=#{projectWeekly.id}
         </if>
+        <if test="projectWeekly.isDeleted!=null">
+            and pw.is_deleted=#{projectWeekly.isDeleted}
+        </if>
         <if test="projectWeekly.projectId!=null">
             and pw.project_id=#{projectWeekly.projectId}
         </if>
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java
index c22f582..5907f81 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java
@@ -103,15 +103,15 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
                 List<ProjectWeeklyDto> list = projectDepartmentService.getListByDeptId(page, projectWeekly);
                 // 如果部门的thisWeek和nextWeek为空时,拼接个人的thisWeek和nextWeek添加进去
                 List<ProjectWeeklyDto> newList = getThisWeek(list);
-                //判断当前账号是否是项目专员/负责人
-                Page<ProjectWeekly> page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
-                EntityWrapper<ProjectWeekly> weeklyEntityWrapper = new EntityWrapper<>();
-                weeklyEntityWrapper.eq("user_id",String.valueOf(systemUserLogin.getUserinfoId()));
-                weeklyEntityWrapper.eq("weekly_type","1");
-                weeklyEntityWrapper.eq("dept_id","");
-                weeklyEntityWrapper.eq("is_deleted","1");
-                ProjectWeekly weekly = projectWeeklyService.selectOne(weeklyEntityWrapper);
-                if (!ObjectUtils.isEmpty(weekly)) {//如果查到确实是项目专员/负责人，通过项目ID拿到所有人的专项填报
+//                //判断当前账号是否是项目专员/负责人
+//                Page<ProjectWeekly> page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
+//                EntityWrapper<ProjectWeekly> weeklyEntityWrapper = new EntityWrapper<>();
+//                weeklyEntityWrapper.eq("user_id",String.valueOf(systemUserLogin.getUserinfoId()));
+//                weeklyEntityWrapper.eq("weekly_type","1");
+//                weeklyEntityWrapper.eq("dept_id","");
+//                weeklyEntityWrapper.eq("is_deleted","1");
+//                ProjectWeekly weekly = projectWeeklyService.selectOne(weeklyEntityWrapper);
+                /*if (!ObjectUtils.isEmpty(weekly)) {//如果查到确实是项目专员/负责人，通过项目ID拿到所有人的专项填报
                     ProjectWeekly projectWeekly1 = new ProjectWeekly();
                     projectWeekly1.setIsDeleted("0");
                     projectWeekly1.setWeeklyType("0");
@@ -126,7 +126,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
                         page.setTotal(page.getTotal()+page2.getTotal());
                         page.setSize(page.getSize()+page2.getSize());
                     }
-                }
+                }*/
 
                 //组装结果集
                 ProjectWeeklyListResp listResp = new ProjectWeeklyListResp();
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 035cf80..75a689a 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
@@ -206,19 +206,19 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
                 weeklyEntityWrapper.eq("weekly_type", "1");
                 weeklyEntityWrapper.eq("dept_id", "");
                 weeklyEntityWrapper.eq("is_deleted", "1");
-                ProjectWeekly weekly = projectWeeklyService.selectOne(weeklyEntityWrapper);
-                if (!ObjectUtils.isEmpty(weekly)) {//如果查到确实是项目专员/负责人，通过项目ID拿到所有人的专项填报
+                List<ProjectWeekly> weekly = projectWeeklyService.selectList(weeklyEntityWrapper);
+                if (weekly.size() > 1) {//如果查到确实是项目专员/负责人，通过项目ID拿到所有人的专项填报
                     ProjectWeekly projectWeekly1 = new ProjectWeekly();
                     projectWeekly1.setIsDeleted("0");
                     projectWeekly1.setWeeklyType("0");
-                    projectWeekly1.setProjectId(weekly.getProjectId());
+                   // 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<ProjectWeeklyDto> list1 = projectWeeklyService.getList(page2, projectWeekly1);
                     if(!ObjectUtils.isEmpty(list1)){
-                        list.addAll(list1);
+                        list = list1;
                         page.setTotal(page.getTotal()+page2.getTotal());
                         page.setSize(page.getSize()+page2.getSize());
                     }
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectWholeFirmController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectWholeFirmController.java
index 1c95852..939262e 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectWholeFirmController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectWholeFirmController.java
@@ -69,34 +69,12 @@ public class ProjectWholeFirmController implements ProjectWholeFirmApi {
             List<ProjectWeeklyDto> list = projectWholeFirmService.getList(page, projectWeekly);
             // 如果部门的thisWeek和nextWeek为空时,拼接个人的thisWeek和nextWeek添加进去
             List<ProjectWeeklyDto> newList = getThisWeek(list);
-            //判断当前账号是否是项目专员/负责人
+
             //因为json里面存的是人事id，通过账号找不到，先把账号id转为人事id
             Page<ProjectWeekly> page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
             EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
             userLoginEntityWrapper.eq("id_",userId);
             SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
-            EntityWrapper<ProjectWeekly> weeklyEntityWrapper = new EntityWrapper<>();
-            weeklyEntityWrapper.eq("user_id",String.valueOf(systemUserLogin.getUserinfoId()));
-            weeklyEntityWrapper.eq("weekly_type","1");
-            weeklyEntityWrapper.eq("dept_id","");
-            weeklyEntityWrapper.eq("is_deleted","1");
-            ProjectWeekly weekly = projectWeeklyService.selectOne(weeklyEntityWrapper);
-            if (!ObjectUtils.isEmpty(weekly)) {//如果查到确实是项目专员/负责人，通过项目ID拿到所有人的专项填报
-                ProjectWeekly projectWeekly1 = new ProjectWeekly();
-                projectWeekly1.setIsDeleted("0");
-                projectWeekly1.setWeeklyType("0");
-                projectWeekly1.setProjectId(weekly.getProjectId());
-                JSONObject ext = projectWeekly1.getExt();
-               //projectWeekly1.setExt((JSONObject) ext.put("userId", String.valueOf(systemUserLogin.getUserinfoId())));
-                if(!StringUtils.isEmpty(projectWeeklyFindReq.getId()!=null))projectWeekly1.setId(projectWeeklyFindReq.getId());
-                if(!StringUtils.isEmpty(projectWeeklyFindReq.getDeptId()!=null))projectWeekly.setDeptId(projectWeeklyFindReq.getDeptId());
-                List<ProjectWeeklyDto> list1 = projectWholeFirmService.getList(page2, projectWeekly1);
-                if(!ObjectUtils.isEmpty(list1)){
-                    list.addAll(list1);
-                    page.setTotal(page.getTotal()+page2.getTotal());
-                    page.setSize(page.getSize()+page2.getSize());
-                }
-            }
 
             //组装结果集
             ProjectWeeklyListResp listResp = new ProjectWeeklyListResp();