diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java
index dd007e0..c1f9719 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java
@@ -116,6 +116,28 @@ public class ReportManageConroller {
         return Result.success(map);
     }
 
+    /**
+     * 判断报告名称是否被占用
+     * @param vo
+     * @return
+     */
+    @ApiOperation("判断报告名称是否被占用")
+    @PostMapping("/isReportNameOccupy")
+    @ReportLog(description = "新增或编辑")
+    public ResponseMessage isReportNameOccupy(@RequestBody ReportVo vo) throws IOException {
+
+        long count = reportDao.isReportNameOccupyByEO(vo);
+        if (count > 0){
+            return Result.error("报告名称已存在");
+        }
+        long count1 = reportDao.isReportNameOccupyByAct(vo);
+        if (count1 > 0){
+            return Result.error("报告名称已流程中存在");
+        }
+
+        return Result.success();
+    }
+
     /**
      * 报告详情接口
      * @param reportId
diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java
index 9c79032..23c7228 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java
@@ -62,6 +62,10 @@ public interface ReportDao extends BaseMapper<ReportEntity> {
 
     long selectByidAndName(@Param("Vo")ReportEntity entity);
 
+    long isReportNameOccupyByEO(@Param("Vo")ReportVo Vo);
+
+    long isReportNameOccupyByAct(ReportVo vo);
+
     void saveReportAct(@Param("Vo") TtReportManageAct ttReportManageAct);
 
     ReportDetailVo reportDetail(@Param("reportId") String reportId);
@@ -72,4 +76,5 @@ public interface ReportDao extends BaseMapper<ReportEntity> {
      */
     List<ReportEntity> selectDDL();
 
+
 }
diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
index e8df43b..4f894fc 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
@@ -623,21 +623,6 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
 
     @Override
     public List<String> isAct(ReportQueryVo vo) {
-        boolean flag = false;
-        //判断是不是管理员
-        boolean admin = false;
-        List<RoleEO> roleEOList = roleEODao.selectByuserId(UserUtils.getUserId());
-        for (RoleEO roleEO : roleEOList) {
-            if ("管理员".equals(roleEO.getName())){
-                admin= !admin;
-            }
-        }
-        if (admin) {
-            vo.setUsid(null);
-        } else {
-            vo.setUsid(UserUtils.getUserId());
-        }
-
         List<String> act = baseMapper.isAct(vo);
         return  act;
     }
diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
index 996259e..efc3d5e 100644
--- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
+++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
@@ -250,7 +250,29 @@
             </if>
         </where>
     </select>
+    <select id="isReportNameOccupyByEO" resultType="java.lang.Long">
+        select  count(1) from  tt_report_manage rep
+        <where>
+            rep.Name = #{Vo.name}
+            and rep.del_flag = 0
+            <if test="Vo.id != null and Vo.id != ''">
+                and  rep.id != #{Vo.id}
+            </if>
+        </where>
+    </select>
+    <select id="isReportNameOccupyByAct" resultType="java.lang.Long">
+        select  count(1) from  tt_report_manage_act rep
+        LEFT JOIN bus_process_name pro on rep.prc_id=pro.PRC_ID
+        <where>
+            pro.SUBMIT_STATUS = 1
+            and rep.Name = #{Vo.name}
+            and rep.del_flag = 0
+            <if test="Vo.id != null and Vo.id != ''">
+                and  rep.report_id != #{Vo.id}
+            </if>
+        </where>
 
+    </select>
 
     <select id="reportDetail" resultType="com.adc.da.report.vo.ReportDetailVo">
         SELECT
diff --git a/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TtReportManageActDao.class b/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TtReportManageActDao.class
index dd21bec..c37eb6f 100644
Binary files a/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TtReportManageActDao.class and b/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TtReportManageActDao.class differ
diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_main/entity/BusProcessName.class b/report-activity/target/classes/com/adc/da/wkflow/business_main/entity/BusProcessName.class
index 578426c..c851353 100644
Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_main/entity/BusProcessName.class and b/report-activity/target/classes/com/adc/da/wkflow/business_main/entity/BusProcessName.class differ