diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java
index b9d54a4..afc2fb6 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java
@@ -47,7 +47,7 @@ public class AdmissionRequestController extends BaseController {
         try {
 //            startPage();
             List<AdmissionRequest> list = arService.getContPersonByProIdAndOtherId(bean);
-            return getDataTable1(list);
+            return getDataTable(list);
         } catch (Exception e) {
             logger.error(e.toString(), e);
         }
@@ -87,7 +87,7 @@ public class AdmissionRequestController extends BaseController {
         try {
 //            startPage();
             List<AdmissionRequest> list = arService.listEntranceOfPersonnel(bean);
-            return getDataTable1(list);
+            return getDataTable(list);
         } catch (Exception e) {
             logger.error(e.toString(), e);
         }
diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/ConsApprovalController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/ConsApprovalController.java
index c8bec5e..2dd364d 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/ConsApprovalController.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/ConsApprovalController.java
@@ -40,9 +40,9 @@ public class ConsApprovalController extends BaseController {
             "承包商入场资质列表查询")
     public TableDataInfo getConsEntranceList(ConsUnit bean) {
         try {
-//            startPage();
+            //   startPage();
             List<ConsUnit> list = service.getConsEntranceList(bean);
-            return getDataTable1(list);
+            return getDataTable(list);
         } catch (Exception e) {
             logger.error(e.toString(), e);
         }
diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/ContEntryExitController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/ContEntryExitController.java
index 1372a3e..8f39ed6 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/ContEntryExitController.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/ContEntryExitController.java
@@ -64,7 +64,7 @@ public class ContEntryExitController extends BaseController {
         try {
 //            startPage();
             List<ContEntryExit> list = ceService.listCommencementApproval(bean);
-            return getDataTable1(list);
+            return getDataTable(list);
         } catch (Exception e) {
             logger.error(e.toString(), e);
         }
@@ -145,7 +145,7 @@ public class ContEntryExitController extends BaseController {
         try {
 //            startPage();
             List<ContEntryExit> list = ceService.listCompleteApproval(bean);
-            return getDataTable1(list);
+            return getDataTable(list);
         } catch (Exception e) {
             logger.error(e.toString(), e);
         }
diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/EngineeringEquipmentBindController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/EngineeringEquipmentBindController.java
index ec40d56..e0bbe41 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/EngineeringEquipmentBindController.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/EngineeringEquipmentBindController.java
@@ -146,7 +146,7 @@ public class EngineeringEquipmentBindController extends BaseController {
         try {
 //            startPage();
             List<ConstructionMaterials> list = eeService.listConstructionMaterial(bean);
-            return getDataTable1(list);
+            return getDataTable(list);
         } catch (Exception e) {
             logger.error(e.toString(), e);
         }
diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/EquipController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/EquipController.java
index 6c47c82..d4c0452 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/EquipController.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/EquipController.java
@@ -43,7 +43,7 @@ public class EquipController extends BaseController {
         try {
 //            startPage();
             List<Equipment> list = service.selectEquipList(bean);
-            return getDataTable1(list);
+            return getDataTable(list);
         } catch (Exception e) {
             log.error(e.toString(), e);
         }
@@ -98,7 +98,7 @@ public class EquipController extends BaseController {
         try {
 //            startPage();
             List<Equipment> list = service.entryOfUtensilsList(bean);
-            return getDataTable1(list);
+            return getDataTable(list);
         } catch (Exception e) {
             log.error(e.toString(), e);
         }
diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/MaterialController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/MaterialController.java
index 10faf7e..1a80eee 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/MaterialController.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/MaterialController.java
@@ -44,7 +44,7 @@ public class MaterialController extends BaseController {
         try {
 //            startPage();
             List<ProMaterial> list = service.getEnterFileList(bean);
-            return getDataTable1(list);
+            return getDataTable(list);
         } catch (Exception e) {
             logger.error(e.toString(), e);
         }
diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SecurityCheckController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SecurityCheckController.java
index b21aed9..d36c68a 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SecurityCheckController.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SecurityCheckController.java
@@ -369,7 +369,7 @@ public class SecurityCheckController extends BaseController {
         try {
 //            startPage();
             List<HiddenProblemsFixVo> list = service.getHiddenDangerRectificationList(dto);
-            return getDataTable1(list);
+            return getDataTable(list);
         } catch (Exception e) {
             log.error(e.toString(), e);
         }
@@ -459,7 +459,7 @@ public class SecurityCheckController extends BaseController {
         try {
 //            startPage();
             List<PitfallDelayApprovalVo> list = service.getReviewOfDeferredApprovalList(dto);
-            return getDataTable1(list);
+            return getDataTable(list);
         } catch (Exception e) {
             log.error(e.toString(), e);
         }
@@ -548,7 +548,7 @@ public class SecurityCheckController extends BaseController {
         try {
 //            startPage();
             List<HiddenDangerRectificationVo> list = service.getHiddenDangerRectificationApprovalList(dto);
-            return getDataTable1(list);
+            return getDataTable(list);
         } catch (Exception e) {
             log.error(e.toString(), e);
         }
diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SubController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SubController.java
index 9cb02cd..da4ae1d 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SubController.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SubController.java
@@ -90,7 +90,7 @@ public class SubController extends BaseController {
     public TableDataInfo enterPersonList(SubPerson bean) {
         try{
             List<SubPerson> list = service.enterPersonList(bean);
-            return getDataTable1(list);
+            return getDataTable(list);
         }catch (Exception e){
             log.error(e.toString(),e);
         }
@@ -103,8 +103,7 @@ public class SubController extends BaseController {
     @SysLog(title = "分包商管理", businessType = OperaType.QUERY,logType = 0,module = "分包商管理->人员入场审核")
     public AjaxResult submitPersonApproval(@RequestBody RequestEntity bean) {
         try{
-            AjaxResult list = service.submitPersonApproval(bean);
-            return list;
+            return service.submitPersonApproval(bean);
         }catch (Exception e){
             log.error(e.toString(),e);
         }
diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SubEntryExitController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SubEntryExitController.java
index 5cfc8c1..5c252b2 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SubEntryExitController.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SubEntryExitController.java
@@ -43,7 +43,7 @@ public class SubEntryExitController extends BaseController {
         try {
 //            startPage();
             List<SubEntryExit> list = seService.listSubEntry(bean);
-            return getDataTable1(list);
+            return getDataTable(list);
         } catch (Exception e) {
             logger.error(e.toString(), e);
         }
@@ -63,7 +63,7 @@ public class SubEntryExitController extends BaseController {
         try {
 //            startPage();
             List<SubEntryExit> list = seService.listSubExit(bean);
-            return getDataTable1(list);
+            return getDataTable(list);
         } catch (Exception e) {
             logger.error(e.toString(), e);
         }
diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SupervisionUnitController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SupervisionUnitController.java
index 763a2f0..cb69f54 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SupervisionUnitController.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SupervisionUnitController.java
@@ -170,7 +170,7 @@ public class SupervisionUnitController extends BaseController {
         try {
 //            startPage();
             List<SupervisionOfAdmission> list = suService.listSupEntry(bean);
-            return getDataTable1(list);
+            return getDataTable(list);
         } catch (Exception e) {
             logger.error(e.toString(), e);
         }
diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/ViolationManagementController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/ViolationManagementController.java
index 0dfdcd5..6d48075 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/ViolationManagementController.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/ViolationManagementController.java
@@ -137,7 +137,7 @@ public class ViolationManagementController extends BaseController {
         try {
 //            startPage();
             List<ViolationPunishVo> list = service.getViolationPunishApprovalList(dto);
-            return getDataTable1(list);
+            return getDataTable(list);
         } catch (Exception e) {
             log.error(e.toString(), e);
         }
diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/ContEntryExitMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/ContEntryExitMapper.xml
index ecdaa37..9e5a9cd 100644
--- a/bonus-modules/bonus-project/src/main/resources/mapper/system/ContEntryExitMapper.xml
+++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/ContEntryExitMapper.xml
@@ -102,7 +102,7 @@
             AND lpc.pro_id = #{proId}
         </if>
         <if test='dataType==1'>
-            AND   lpc.proc_inst_id IN (
+            AND   lpc.proc_inst_id_start IN (
             <foreach collection="proInsId" item="item" separator=",">
                 #{item}
             </foreach>
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
index d82b2ea..ed55b68 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -278,7 +278,7 @@
             LEFT JOIN lk_pro_sup lps ON psi.uuid= lps.sup_uuid
             left join pt_project_info ppi on ppi.pro_id = lps.pro_id
             WHERE
-            user_id = #{userId} and  lps.pro_id is not null and ppi.pro_name is not null
+            user_id = #{userId} and  lps.pro_id is not null and ppi.pro_name is not null  and  ppi.pro_status!=1
         </if>
         <if test="userType == '02'">
             SELECT
@@ -305,8 +305,7 @@
             LEFT JOIN lk_pro_cont lpc ON pci.uuid = lpc.cont_uuid
             left join pt_sup_info psi on psi.uuid = lpc.sup_uuid
             left join pt_project_info ppi on ppi.pro_id = lpc.pro_id
-            WHERE
-            user_id = #{userId} and  lpc.pro_id is not null and ppi.pro_name is not null
+            WHERE  user_id = #{userId} and  lpc.pro_id is not null and ppi.pro_name is not null and  ppi.pro_status!=1
         </if>
         <if test="userType == '03'">
             SELECT
@@ -333,7 +332,7 @@
             left join pt_sub_info psii on psii.uuid = lcs.sup_uuid
             left join pt_project_info ppi on ppi.pro_id = lcs.pro_id
             WHERE
-            user_id = #{userId}  and lcs.pro_id is not null and ppi.pro_name is not null
+            user_id = #{userId}  and lcs.pro_id is not null and ppi.pro_name is not null  and  ppi.pro_status!=1
         </if>
         <if test="userType == '04'">
             SELECT
@@ -346,7 +345,7 @@
             lcp.is_exist_file = '1'
             left join pt_project_info ppi on ppi.pro_id = lcp.pro_id
             WHERE
-            user_id = #{userId} and ppi.pro_id is not null and ppi.pro_name is not null
+            user_id = #{userId} and ppi.pro_id is not null and ppi.pro_name is not null  and  ppi.pro_status!=1
             GROUP BY
             ppi.pro_id
         </if>
@@ -359,7 +358,7 @@
             LEFT JOIN lk_sup_person lcp ON su.parent_uuid = lcp.sup_uuid and lcp.is_exist_file = '1'
             left join pt_project_info ppi on ppi.pro_id = lcp.pro_id
             WHERE
-            user_id = #{userId} and ppi.pro_id is not null and ppi.pro_name is not null
+            user_id = #{userId} and ppi.pro_id is not null and ppi.pro_name is not null  and  ppi.pro_status!=1
             GROUP BY
             ppi.pro_id
         </if>