1.数据权限调整优化

src/main/java/com/baosight/hggp/hg/cg/sql/HGCG001.xml

@@ -31,29 +31,9 @@
         AUDIT_REASON as "auditReason" <!-- 审核原因 -->
     </sql>
 
-    <sql id="authCondition">
-        <!-- 无权限时使用 -->
-        <isNotEmpty prepend=" AND " property="authDepCode">
-            DEP_CODE = #authDepCode#
-        </isNotEmpty>
-        <!-- 仅本人和部门组合 -->
-        <isEqual prepend=" AND " property="authCombination" compareValue="1">
-            (CREATED_BY = #authOnlyPeople# OR DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>)
-        </isEqual>
-        <!-- 仅本人或部门 -->
-        <isNotEqual prepend=" AND " property="authCombination" compareValue="1">
-            <isNotEmpty property="authOnlyPeople">
-                CREATED_BY = #authOnlyPeople#
-            </isNotEmpty>
-            <isNotEmpty property="authDepCodes">
-                DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>
-            </isNotEmpty>
-        </isNotEqual>
-    </sql>
-
 	<sql id="condition">
         AND DELETE_FLAG = 0
-        <include refid="authCondition"/>
+        <include refid="HGXSDataAuth.authCondition"/>
         <include refid="idCondition"/>
         <include refid="customCondition"/>
 		<isNotEmpty prepend=" AND " property="id">

src/main/java/com/baosight/hggp/hg/cg/sql/HGCG002.xml

@@ -43,6 +43,7 @@
 
     <sql id="condition">
         AND DELETE_FLAG = 0
+        <include refid="HGXSDataAuth.authCondition"/>
         <include refid="idCondition"/>
         <include refid="customCondition"/>
         <isNotEmpty prepend=" AND " property="id">

src/main/java/com/baosight/hggp/hg/cg/sql/HGCG003.xml

@@ -37,6 +37,7 @@
 
     <sql id="condition">
         AND DELETE_FLAG = 0
+        <include refid="HGXSDataAuth.authCondition"/>
         <include refid="idCondition"/>
         <include refid="customCondition"/>
         <isNotEmpty prepend=" AND " property="id">

src/main/java/com/baosight/hggp/hg/xs/sql/HGXSDataAuth.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
+<sqlMap namespace="HGXSDataAuth">
+
+    <sql id="authCondition">
+        <!-- 无权限时使用 -->
+        <isNotEmpty prepend=" AND " property="authDepCode">
+            DEP_CODE = #authDepCode#
+        </isNotEmpty>
+        <!-- 仅本人和部门组合 -->
+        <isEqual prepend=" AND " property="authCombination" compareValue="1">
+            (CREATED_BY = #authOnlyPeople# OR DEP_CODE IN <iterate close=")" open="(" conjunction=","
+                property="authDepCodes">#authDepCodes[]#</iterate>)
+        </isEqual>
+        <!-- 仅本人或部门 -->
+        <isNotEqual prepend=" AND " property="authCombination" compareValue="1">
+            <isNotEmpty property="authOnlyPeople">
+                CREATED_BY = #authOnlyPeople#
+            </isNotEmpty>
+            <isNotEmpty property="authDepCodes">
+                DEP_CODE IN
+                <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>
+            </isNotEmpty>
+        </isNotEqual>
+    </sql>
+
+</sqlMap>

src/main/resources/resources/ibatis/sqlmap-config.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sqlMapConfig PUBLIC "-//iBatis.com//DTD SQL Map Config 2.0//EN" "http://www.iBatis.com/dtd/sql-map-config-2.dtd">
+<sqlMapConfig>
+
+    <properties resource="application.properties" />
+    <settings useStatementNamespaces="true" />
+    <sqlMap resource="resources/ibatis/Dummy.xml" />
+
+    <!-- 数据权限 -->
+    <sqlMap resource="com/baosight/hggp/hg/xs/sql/HGXSDataAuth.xml"/>
+
+    <!-- 采购 -->
+    <sqlMap resource="com/baosight/hggp/hg/cg/sql/HGCG001.xml"/>
+    <sqlMap resource="com/baosight/hggp/hg/cg/sql/HGCG002.xml"/>
+    <sqlMap resource="com/baosight/hggp/hg/cg/sql/HGCG003.xml"/>
+
+</sqlMapConfig>

src/main/resources/sqlMapConfig.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sqlMapConfig PUBLIC "-//iBatis.com//DTD SQL Map Config 2.0//EN" "http://www.iBatis.com/dtd/sql-map-config-2.dtd">
-
-<sqlMapConfig>
-  <sqlMap resource="com/baosight/hpjx/hp/sb/sql/tHpsb001.xml"/>
-  <sqlMap resource="com/baosight/hpjx/hp/sb/sql/tHpsb002.xml"/>
-</sqlMapConfig>