diff --git a/adc-da-login/src/main/java/com/adc/da/login/config/ShiroFilterConfiguration.java b/adc-da-login/src/main/java/com/adc/da/login/config/ShiroFilterConfiguration.java
index 6219e9e..03f89b2 100644
--- a/adc-da-login/src/main/java/com/adc/da/login/config/ShiroFilterConfiguration.java
+++ b/adc-da-login/src/main/java/com/adc/da/login/config/ShiroFilterConfiguration.java
@@ -121,7 +121,7 @@ public class ShiroFilterConfiguration {
         filterChainDefinitionMap.put(restPath + "/updatePassword", ANON);
         filterChainDefinitionMap.put(restPath + "/user/supplierRegistry/*", ANON);
 
-//        filterChainDefinitionMap.put(restPath  + "/**", AUTHC);
+        filterChainDefinitionMap.put(restPath  + "/**", AUTHC);
 
         /* static 不需登录 */
         filterChainDefinitionMap.put("/static/**", ANON);
diff --git a/adc-da-login/src/main/java/com/adc/da/login/security/AdcFormAuthenticationFilter.java b/adc-da-login/src/main/java/com/adc/da/login/security/AdcFormAuthenticationFilter.java
index eb3a027..8e440b5 100644
--- a/adc-da-login/src/main/java/com/adc/da/login/security/AdcFormAuthenticationFilter.java
+++ b/adc-da-login/src/main/java/com/adc/da/login/security/AdcFormAuthenticationFilter.java
@@ -1,11 +1,8 @@
 package com.adc.da.login.security;
 
-import com.adc.da.util.exception.AdcDaBaseException;
-import com.adc.da.util.http.ResponseMessage;
 import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.util.ThreadContext;
-import org.apache.shiro.web.servlet.ShiroHttpServletResponse;
 import org.apache.shiro.web.subject.WebSubject;
 import org.apache.shiro.web.util.WebUtils;
 import org.springframework.stereotype.Service;
@@ -56,6 +53,7 @@ public class AdcFormAuthenticationFilter extends org.apache.shiro.web.filter.aut
         return new UsernamePasswordToken(username, record.toCharArray(), rememberMe, host, captcha);
     }
 
+    @Override
     protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
         Subject subject = this.getSubject(request, response);
 
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 00a9f5f..b92eeb9 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
@@ -36,7 +36,8 @@
         <if test="pageVO.usid !='' and pageVO.usid != null">
             AND eo.id NOT IN ( SELECT ru.reportId FROM tr_report_user ru WHERE ru.userId =  #{pageVO.usid} )
             AND eo.id NOT IN ( SELECT tt.report_id FROM power_apply tt WHERE tt.user_id = #{pageVO.usid} )
-            AND eo.id NOT IN (SELECT tt.report_id FROM power_apply_act tt WHERE tt.user_id = #{pageVO.usid} and del_flag != 1 )
+            AND eo.id NOT IN (SELECT tt.report_id FROM power_apply_act tt WHERE tt.user_id = #{pageVO.usid} and
+            del_flag != 1 and  pro.SUBMIT_STATUS = 1)
         </if>
         <if test="pageVO.name !='' and pageVO.name != null">
             and name like  CONCAT(CONCAT('%',#{pageVO.name}),'%')
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java
index d46b74f..a6fb932 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java
@@ -3,8 +3,6 @@ package com.adc.da.sys.controller;
 import com.adc.da.base.web.BaseController;
 import com.adc.da.excel.poi.excel.ExcelImportUtil;
 import com.adc.da.excel.poi.excel.entity.ImportParams;
-import com.adc.da.excel.poi.excel.entity.result.ExcelImportResult;
-import com.adc.da.excel.poi.excel.entity.result.ExcelVerifyHanlderErrorResult;
 import com.adc.da.sys.constant.SysConstants;
 import com.adc.da.sys.entity.UserEO;
 import com.adc.da.sys.service.iservice.IUserEoService;
@@ -12,7 +10,6 @@ import com.adc.da.sys.util.EncryptUtil;
 import com.adc.da.sys.util.RSAUtil;
 import com.adc.da.sys.vo.UserImportVO;
 import com.adc.da.sys.vo.UserVO;
-import com.adc.da.util.exception.AdcDaBaseException;
 import com.adc.da.util.http.ResponseMessage;
 import com.adc.da.util.http.Result;
 import com.adc.da.util.utils.FileUtil;
@@ -25,31 +22,22 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.beans.BeanUtils;
-import javax.annotation.Resource;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import static org.aspectj.weaver.tools.cache.SimpleCacheFactory.path;
-
 @RestController
 @RequestMapping("/${restPath}/sys/user")
 @Api(tags = {"Sys-用户管理"})
diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class
index 1423e56..be220f3 100644
Binary files a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class and b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class differ
diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java
index b7d3978..5566192 100644
--- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java
+++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java
@@ -239,15 +239,16 @@ public class TodoTaskController {
                         iBusProcessNewService.saveOrUpdate(busProcessNew);
                     }
                 }
-
-                BusProcessEntrust busProcessEntrust = new BusProcessEntrust();
-                busProcessEntrust.setEnUserId(assignee);
-                busProcessEntrust.setUserId(userId);
-                busProcessEntrust.setValidFlag("0");
-                busProcessEntrust.setPrcId(pId);
-                busProcessEntrust.setPrcName(one.getPrcName());
-                busProcessEntrust.setTaskId(str);
-                iBusProcessEntrustService.save(busProcessEntrust);
+                if (replaceMap == null) {
+                    BusProcessEntrust busProcessEntrust = new BusProcessEntrust();
+                    busProcessEntrust.setEnUserId(assignee);
+                    busProcessEntrust.setUserId(userId);
+                    busProcessEntrust.setValidFlag("0");
+                    busProcessEntrust.setPrcId(pId);
+                    busProcessEntrust.setPrcName(one.getPrcName());
+                    busProcessEntrust.setTaskId(str);
+                    iBusProcessEntrustService.save(busProcessEntrust);
+                }
             }
         }
         //监控流程中 变更处理人为永久变更