diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
index 3fd2955..d5c561b 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
@@ -338,6 +338,10 @@
         <if test="actUserId!=null and actUserId!=''">
             and a.ACT_USER_ID= #{actUserId}
         </if>
+        --         是否是五包案卷
+        <if test="isShop!=null and isShop!=''">
+            and a.SHOP_ID is not null
+        </if>
         --         案卷状态（节点）
         <if test="queryCondition.caseState!=null and queryCondition.caseState!=''">
             and a.CASE_STATE= #{queryCondition.caseState}
@@ -472,6 +476,10 @@
         <if test="queryCondition.caseState!=null and queryCondition.caseState!=''">
             and a.CASE_STATE= #{queryCondition.caseState}
         </if>
+        --         是否是五包案卷
+        <if test="isShop!=null and isShop!=''">
+            and a.SHOP_ID is not null
+        </if>
         --         是否缓办
         <if test="queryCondition.isPostpone!=null and queryCondition.isPostpone!=''">
             and a.IS_POSTPONE= #{queryCondition.isPostpone}

diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
index 3fd2955..d5c561b 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
@@ -338,6 +338,10 @@
         <if test="actUserId!=null and actUserId!=''">
             and a.ACT_USER_ID= #{actUserId}
         </if>
+        --         是否是五包案卷
+        <if test="isShop!=null and isShop!=''">
+            and a.SHOP_ID is not null
+        </if>
         --         案卷状态（节点）
         <if test="queryCondition.caseState!=null and queryCondition.caseState!=''">
             and a.CASE_STATE= #{queryCondition.caseState}
@@ -472,6 +476,10 @@
         <if test="queryCondition.caseState!=null and queryCondition.caseState!=''">
             and a.CASE_STATE= #{queryCondition.caseState}
         </if>
+        --         是否是五包案卷
+        <if test="isShop!=null and isShop!=''">
+            and a.SHOP_ID is not null
+        </if>
         --         是否缓办
         <if test="queryCondition.isPostpone!=null and queryCondition.isPostpone!=''">
             and a.IS_POSTPONE= #{queryCondition.isPostpone}
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/QueryCondition.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/QueryCondition.java
index 438d579..578ea56 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/QueryCondition.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/QueryCondition.java
@@ -219,10 +219,10 @@
      */
     private String isProcessOvertime;
 
-    //    @Override
-//    protected Serializable pkVal() {
-//        return this.id;
-//    }
+    /**
+     * 是否商户案卷
+     */
+    private String isShop;
 
 
     @Override

diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
index 3fd2955..d5c561b 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
@@ -338,6 +338,10 @@
         <if test="actUserId!=null and actUserId!=''">
             and a.ACT_USER_ID= #{actUserId}
         </if>
+        --         是否是五包案卷
+        <if test="isShop!=null and isShop!=''">
+            and a.SHOP_ID is not null
+        </if>
         --         案卷状态（节点）
         <if test="queryCondition.caseState!=null and queryCondition.caseState!=''">
             and a.CASE_STATE= #{queryCondition.caseState}
@@ -472,6 +476,10 @@
         <if test="queryCondition.caseState!=null and queryCondition.caseState!=''">
             and a.CASE_STATE= #{queryCondition.caseState}
         </if>
+        --         是否是五包案卷
+        <if test="isShop!=null and isShop!=''">
+            and a.SHOP_ID is not null
+        </if>
         --         是否缓办
         <if test="queryCondition.isPostpone!=null and queryCondition.isPostpone!=''">
             and a.IS_POSTPONE= #{queryCondition.isPostpone}
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/QueryCondition.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/QueryCondition.java
index 438d579..578ea56 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/QueryCondition.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/QueryCondition.java
@@ -219,10 +219,10 @@
      */
     private String isProcessOvertime;
 
-    //    @Override
-//    protected Serializable pkVal() {
-//        return this.id;
-//    }
+    /**
+     * 是否商户案卷
+     */
+    private String isShop;
 
 
     @Override
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 7ce1a3e..ea7ca3d 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -11,7 +11,7 @@
   aop:
     proxy-target-class: true #false为启用jdk默认动态代理,true为cglib动态代理
 flowable:
-  checkProcessDefinitions: false #不校验process文件夹
+  checkProcessDefinitions: false #不校验processes文件夹
 ###################  mybatis-plus配置  ###################
 ###################  guns配置  ###################
 casic:

diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
index 3fd2955..d5c561b 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
@@ -338,6 +338,10 @@
         <if test="actUserId!=null and actUserId!=''">
             and a.ACT_USER_ID= #{actUserId}
         </if>
+        --         是否是五包案卷
+        <if test="isShop!=null and isShop!=''">
+            and a.SHOP_ID is not null
+        </if>
         --         案卷状态（节点）
         <if test="queryCondition.caseState!=null and queryCondition.caseState!=''">
             and a.CASE_STATE= #{queryCondition.caseState}
@@ -472,6 +476,10 @@
         <if test="queryCondition.caseState!=null and queryCondition.caseState!=''">
             and a.CASE_STATE= #{queryCondition.caseState}
         </if>
+        --         是否是五包案卷
+        <if test="isShop!=null and isShop!=''">
+            and a.SHOP_ID is not null
+        </if>
         --         是否缓办
         <if test="queryCondition.isPostpone!=null and queryCondition.isPostpone!=''">
             and a.IS_POSTPONE= #{queryCondition.isPostpone}
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/QueryCondition.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/QueryCondition.java
index 438d579..578ea56 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/QueryCondition.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/QueryCondition.java
@@ -219,10 +219,10 @@
      */
     private String isProcessOvertime;
 
-    //    @Override
-//    protected Serializable pkVal() {
-//        return this.id;
-//    }
+    /**
+     * 是否商户案卷
+     */
+    private String isShop;
 
 
     @Override
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 7ce1a3e..ea7ca3d 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -11,7 +11,7 @@
   aop:
     proxy-target-class: true #false为启用jdk默认动态代理,true为cglib动态代理
 flowable:
-  checkProcessDefinitions: false #不校验process文件夹
+  checkProcessDefinitions: false #不校验processes文件夹
 ###################  mybatis-plus配置  ###################
 ###################  guns配置  ###################
 casic:
diff --git a/pom.xml b/pom.xml
index 67858d6..773ae15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
         <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
         <jwt.version>0.9.0</jwt.version>
         <hutool.version>4.0.0</hutool.version>
-        <oracle.version>ojdbc6-11.1.0.7.0</oracle.version>
+
     </properties>
 
     <dependencyManagement>
@@ -191,16 +191,16 @@
                 <artifactId>jjwt</artifactId>
                 <version>${jwt.version}</version>
             </dependency>
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-core</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-http</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>cn.hutool</groupId>-->
+                <!--<artifactId>hutool-core</artifactId>-->
+                <!--<version>${hutool.version}</version>-->
+            <!--</dependency>-->
+            <!--<dependency>-->
+                <!--<groupId>cn.hutool</groupId>-->
+                <!--<artifactId>hutool-http</artifactId>-->
+                <!--<version>${hutool.version}</version>-->
+            <!--</dependency>-->
 
         </dependencies>
     </dependencyManagement>