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 7e191a5..8e4f0e6 100644
--- a/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java
+++ b/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java
@@ -76,15 +76,15 @@ public class ProjectInitListener implements ExecutionListener {
                     JSONObject ext = projectInfo.getExt();
 
                     //研究开发类/自主研发类没有填报直接结项
-                    String openRange = String.valueOf(ext.get("openRange"));
-                    if ("3".equals(openRange) || "7".equals(openRange)) {
-                        return;
-                    }
+//                    String openRange = String.valueOf(ext.get("openRange"));
+//                    if ("3".equals(openRange) || "7".equals(openRange)) {
+//                        return;
+//                    }
 
                     //根据部门批量添加部门周报填报
                     JSONArray depts = (JSONArray) ext.get("executeDepts");
                     ArrayList<ProjectWeekly> weeklyArrayList = new ArrayList<>();
-                   if (!ObjectUtils.isEmpty(depts)) {
+                    if (!ObjectUtils.isEmpty(depts)) {
 //                        depts.forEach(a -> {
 //                            ProjectWeekly projectWeekly = new ProjectWeekly();
 //                            projectWeekly.setProjectId(String.valueOf(projectInfo.getId()));
@@ -132,25 +132,20 @@ public class ProjectInitListener implements ExecutionListener {
 //                            jsonObject.put("MainLeader",getSystemUserLogin(String.valueOf(MainLeader.get(1))).getId());
 //                          jsonObject.put("executor",getSystemUserLogin(projectManager).getId());
                         String executor = getExecutor();
-                        StringBuffer stringBuffer = new StringBuffer(executor);
-                        stringBuffer.append(",").append(jsonObject.get("projectManager"));
-                        stringBuffer.append(",").append(jsonObject.get("projectAdmin"));
-                        stringBuffer.append(",").append(jsonObject.get("branchLeaders"));
-                        stringBuffer.append(",").append(jsonObject.get("MainLeader"));
-                        executor = new String(stringBuffer);
-                        jsonObject.put("executor", executor);
+                        StringBuffer stringBuffer = new StringBuffer(executor);//四个部门主任id
+                        StringBuffer buffer = new StringBuffer(); //项目立项执行人id
+                        buffer.append(projectInfo.getCreatedBy());
+                        buffer.append(",").append(jsonObject.get("projectManager"));
+                        buffer.append(",").append(jsonObject.get("projectAdmin"));
+                        buffer.append(",").append(jsonObject.get("branchLeaders"));
+                        buffer.append(",").append(jsonObject.get("MainLeader"));
+                        executor = new String(stringBuffer.append(",").append(buffer));
                         jsonObject.put("taskName", "季度审核填报");
-                        quarterlyEvaluation.setExt(jsonObject);
-                        quarterlyEvaluation.setCreatedAt(new Timestamp(System.currentTimeMillis()));
-                        quarterlyEvaluation.setProjectId(String.valueOf(projectInfo.getId()));
-                        projectQuarterlyEvaluationService.insert(quarterlyEvaluation);
                         //添加季度审核的状态
                         JSONObject infoExt = projectInfo.getExt();
                         infoExt.put("taskName", "结项填报");//任务节点
-                        infoExt.put("executor", executor);
-                        infoExt.put("endExecutor",String.valueOf(projectInfo.getCreatedBy()));//结项的第一个节点的委托人一定是项目专员也就是立项的创建人
-                        infoExt.put("endHistorical",infoExt.get("endExecutor"));//添加第一个历史委托人
-//                          infoExt.put("executor",getSystemUserLogin(projectManager).getId());//当前委托人
+                        infoExt.put("endExecutor", String.valueOf(projectInfo.getCreatedBy()));//结项的第一个节点的委托人一定是项目专员也就是立项的创建人
+                        infoExt.put("endHistorical", infoExt.get("endExecutor"));//添加第一个历史委托人
                         //判断项目负责人是否是办公室部门的
                         EntityWrapper<SystemOrg> orgEntityWrapper = new EntityWrapper<>();
                         orgEntityWrapper.eq("is_deleted", false);
@@ -164,10 +159,19 @@ public class ProjectInitListener implements ExecutionListener {
                             PersonalMember personalMember = personalMemberService.selectOne(memberEntityWrapper);
                             if (!ObjectUtils.isEmpty(personalMember)) {
                                 infoExt.put("isOffice", "0");
+                                infoExt.put("executor", executor);
+                                jsonObject.put("executor", executor);
                             } else {
                                 infoExt.put("isOffice", "1");
+                                infoExt.put("executor", buffer);
+                                jsonObject.put("executor", buffer);
                             }
                         }
+                        quarterlyEvaluation.setExt(jsonObject);
+                        quarterlyEvaluation.setCreatedAt(new Timestamp(System.currentTimeMillis()));
+                        quarterlyEvaluation.setProjectId(String.valueOf(projectInfo.getId()));
+                        projectQuarterlyEvaluationService.insert(quarterlyEvaluation);
+
                         if (!StringUtils.isEmpty(projectInfo.getId())) {
                             projectInfoService.updateById(projectInfo);
 
@@ -177,11 +181,11 @@ public class ProjectInitListener implements ExecutionListener {
                             assessmentIndicatorsEntityWrapper.eq("project_id", projectInfo.getId());
                             List<ProjectAssessmentIndicators> indicatorsList = projectAssessmentIndicatorsService.selectList(assessmentIndicatorsEntityWrapper);
                             if (!ObjectUtils.isEmpty(indicatorsList)) {
-                                indicatorsList.forEach(a->{
+                                indicatorsList.forEach(a -> {
                                     JSONObject aExt = a.getExt();
-                                    aExt.put("branchLeaders",branchLeaders.get(0));
-                                    aExt.put("MainLeader",MainLeader.get(0));
-                                    aExt.put("projectAdmin",projectAdmin.get(0));
+                                    aExt.put("branchLeaders", branchLeaders.get(0));
+                                    aExt.put("MainLeader", MainLeader.get(0));
+                                    aExt.put("projectAdmin", projectAdmin.get(0));
                                     a.setExt(aExt);
                                 });
                                 projectAssessmentIndicatorsService.updateAllColumnBatchById(indicatorsList);
diff --git a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml
index 10d6ec2..6d34d5d 100644
--- a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml
+++ b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml
@@ -146,13 +146,15 @@
 		AND f.activiti_status=2 AND f.is_deleted=FALSE
 	</select>
     <select id="getListByIds"  resultMap="ProjectInfoList">
-        select * from project_info where 1=1
+        select * from project_info
+        <where>
         <if test="list.size>0">
             and cast(id_ as varchar) in
             <foreach collection="list" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>
         </if>
+        </where>
         order by project_info.created_at desc
     </select>
     <select id="getInfoByProName" resultType="com.xqopen.kehui.project.entity.ProjectInfo"