From e9972b11a9237a70980e870d74a6cb0e3f19dec4 Mon Sep 17 00:00:00 2001
From: jingquanliang <540692237@qq.com>
Date: Wed, 18 Mar 2020 21:29:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                 | 10 +++++-----
 src/admin/ru/own/www/mybatis/dao/CategoryMapper.xml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3559526..d00f506 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,10 +8,7 @@
   <component name="ChangeListManager">
     <list default="true" id="b4d3fc76-35aa-4430-9376-34289a819ae0" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebRoot/jqladmin/order/js/order-detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/jqladmin/order/js/order-detail.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebRoot/order/js/order-detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/order/js/order-detail.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebRoot/ueditor/ueditor.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/ueditor/ueditor.config.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/admin/ru/own/www/logic/order/OrderOperateMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/admin/ru/own/www/logic/order/OrderOperateMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/admin/ru/own/www/mybatis/dao/CategoryMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/admin/ru/own/www/mybatis/dao/CategoryMapper.xml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -79,6 +76,7 @@
     <setting file="file://$PROJECT_DIR$/src/ru/own/www/logic/OrderAfterOperate.java" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/src/admin/ru/own/www/logic/order/OrderOperateDAOImpl.java" root0="SKIP_INSPECTION" />
     <setting file="file://$PROJECT_DIR$/src/admin/ru/own/www/logic/order/OrderAfterOperate.java" root0="SKIP_INSPECTION" />
+    <setting file="file://$PROJECT_DIR$/src/admin/ru/own/www/mybatis/dao/CategoryMapper.xml" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/src/ru/own/www/logic/OrderOperate.java" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/src/ru/own/www/entity/OrderShowVO.java" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/WebRoot/order/js/order-list.js" root0="SKIP_INSPECTION" />
@@ -104,6 +102,7 @@
     <setting file="file://$PROJECT_DIR$/src/admin/ru/own/www/util/Utility.java" root0="SKIP_INSPECTION" />
     <setting file="file://$PROJECT_DIR$/src/ru/own/www/logic/ClientUserOperate.java" root0="SKIP_INSPECTION" />
     <setting file="file://$PROJECT_DIR$/src/ru/own/www/payment/PaymentOperate.java" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/admin/ru/own/www/logic/foreground/SecondForegroundPageService.java" root0="SKIP_HIGHLIGHTING" />
   </component>
   <component name="JspContextManager">
     <jsp-to-context jsp-file="file://$PROJECT_DIR$/WebRoot/webIm/cWebIm.jsp" context-file="file://$PROJECT_DIR$/WebRoot/common/header/headermenu.jsp" />
@@ -382,7 +381,8 @@
       <workItem from="1583977391658" duration="51878000" />
       <workItem from="1584177605854" duration="1398000" />
       <workItem from="1584180576804" duration="10000" />
-      <workItem from="1584243004028" duration="2656000" />
+      <workItem from="1584243004028" duration="3267000" />
+      <workItem from="1584528809414" duration="4762000" />
     </task>
     <servers />
   </component>
diff --git a/src/admin/ru/own/www/mybatis/dao/CategoryMapper.xml b/src/admin/ru/own/www/mybatis/dao/CategoryMapper.xml
index e31ecc1..89b92e8 100644
--- a/src/admin/ru/own/www/mybatis/dao/CategoryMapper.xml
+++ b/src/admin/ru/own/www/mybatis/dao/CategoryMapper.xml
@@ -92,7 +92,7 @@
 	
 	
 	<select id="getAllCategoryWithMultilanguage" resultMap="category" parameterType="int">
-		SELECT category.category_id,category.category_father_id,category.is_father,categorymultilanguage.foreign_name as category_name FROM own.categorymultilanguage right join  own.category on category.category_id = categorymultilanguage.category_id and lan_id = #{lanid};
+		SELECT category.category_id,category.category_father_id,category.is_father,categorymultilanguage.foreign_name as category_name FROM own.categorymultilanguage right join  own.category on category.category_id = categorymultilanguage.category_id and lan_id = #{lanid} where category.is_show=1;
 	</select>
 	
 	<select id="getSubCategoryID" resultType="int" parameterType="int">