git-svn-id: https://192.168.57.71/svn/jsgkj@771 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/GroupModelMapper.xml

@@ -3,8 +3,8 @@
 <mapper namespace="com.xt.js.gkaq.frame.mappers.GroupModelMapper" >
   <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.GroupModel" >
     <id column="ID" property="id" jdbcType="VARCHAR" />
-    <result column="ORG" property="org" jdbcType="VARCHAR" />
-    <result column="ROLE" property="role" jdbcType="VARCHAR" />
+    <result column="ORG_ID" property="org" jdbcType="VARCHAR" />
+    <result column="ROLE_ID" property="role" jdbcType="VARCHAR" />
     <result column="REMARK" property="remark" jdbcType="VARCHAR" />
     <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
     <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
@@ -17,7 +17,7 @@
     where ID = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.GroupModel" >
-    insert into AQ_BASIC_FRAME_GROUP (ID, ORG, ROLE, 
+    insert into AQ_BASIC_FRAME_GROUP (ID, ORG_ID, ROLE_ID, 
       REMARK, CREATE_TIME, UPDATE_TIME, 
       STATE,CREATE_USER,UPDATE_USER)
     values (#{id,jdbcType=VARCHAR}, #{org,jdbcType=VARCHAR}, #{role,jdbcType=VARCHAR}, 
@@ -26,8 +26,8 @@
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.GroupModel" >
     update AQ_BASIC_FRAME_GROUP
-    set ORG = #{org,jdbcType=VARCHAR},
-      ROLE = #{role,jdbcType=VARCHAR},
+    set ORG_ID = #{org,jdbcType=VARCHAR},
+      ROLE_ID = #{role,jdbcType=VARCHAR},
       REMARK = #{remark,jdbcType=VARCHAR},
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
       UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
@@ -37,12 +37,12 @@
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select ID, ORG, ROLE, REMARK, CREATE_TIME, UPDATE_TIME, STATE, CREATE_USER, UPDATE_USER
+    select ID, ORG_ID, ROLE_ID, REMARK, CREATE_TIME, UPDATE_TIME, STATE, CREATE_USER, UPDATE_USER
     from AQ_BASIC_FRAME_GROUP
     where ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
-    select ID, ORG, ROLE, REMARK, CREATE_TIME, UPDATE_TIME, STATE, CREATE_USER, UPDATE_USER
+    select ID, ORG_ID, ROLE_ID, REMARK, CREATE_TIME, UPDATE_TIME, STATE, CREATE_USER, UPDATE_USER
     from AQ_BASIC_FRAME_GROUP
   </select>
 </mapper>

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/RoleModelMapper.xml

@@ -53,7 +53,7 @@
     WHERE EXISTS(
     SELECT 1 
     FROM AQ_BASIC_FRAME_USER_GROUP UG JOIN AQ_BASIC_FRAME_GROUP G ON UG.GROUP_ID=G.ID
-    WHERE UG.USER_ID=#{userId,jdbcType=VARCHAR} AND G.ROLE=R.ID AND UG.STATE='1' AND G.STATE='1'
+    WHERE UG.USER_ID=#{userId,jdbcType=VARCHAR} AND G.ROLE_ID=R.ID AND UG.STATE='1' AND G.STATE='1'
 	)
   </select>
 </mapper>

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/UserModelMapper.xml

@@ -70,19 +70,35 @@
 	<!-- 根据用户ID查询授权的菜单 -->
 	<select id="selectAuthMenuByUserid" parameterType="java.lang.String"  resultType="java.lang.String">
 		SELECT M.CODE||':main' FROM AQ_BASIC_FRAME_MENU M WHERE M.STATE='1'
-		AND EXISTS(
-		SELECT 1 FROM AQ_BASIC_FRAME_USER_GROUP UG JOIN AQ_BASIC_FRAME_GROUP_MENU GM
-		ON UG.GROUP_ID=GM.GROUP_ID
-		WHERE UG.USER_ID =#{userId,jdbcType=VARCHAR} AND GM.MENU_ID=M.ID
+		AND(
+			EXISTS(
+			SELECT 1 FROM AQ_BASIC_FRAME_USER_GROUP UG JOIN AQ_BASIC_FRAME_GROUP_MENU GM
+			ON UG.GROUP_ID=GM.GROUP_ID
+			WHERE UG.USER_ID =#{userId,jdbcType=VARCHAR}  AND GM.MENU_ID=M.ID
+			)
+			OR EXISTS(
+			SELECT 1 FROM AQ_BASIC_FRAME_USER_GROUP UG 
+			JOIN AQ_BASIC_FRAME_GROUP G ON UG.GROUP_ID = G.ID 
+			JOIN AQ_BASIC_FRAME_ROLE_MENU RM ON G.role_ID=RM.ROLE_ID
+			WHERE UG.USER_ID =#{userId,jdbcType=VARCHAR}  AND RM.MENU_ID=M.ID
+			)
 		)
 	</select>
 	<!-- 根据用户ID查询授权的功能 -->
 	<select id="selectAuthButtonByUserid" parameterType="java.lang.String"  resultType="java.lang.String">
 		SELECT B.CODE FROM AQ_BASIC_FRAME_BUTTON B WHERE B.STATE='1'
-		AND EXISTS(
-		SELECT 1 FROM AQ_BASIC_FRAME_USER_GROUP UG JOIN AQ_BASIC_FRAME_GROUP_BUTTON
-		GB ON UG.GROUP_ID=GB.GROUP_ID
-		WHERE UG.USER_ID = #{userId,jdbcType=VARCHAR} AND GB.BUTTON_ID=B.ID
+		AND(
+			EXISTS(
+			SELECT 1 FROM AQ_BASIC_FRAME_USER_GROUP UG JOIN AQ_BASIC_FRAME_GROUP_BUTTON
+			GB ON UG.GROUP_ID=GB.GROUP_ID
+			WHERE UG.USER_ID = #{userId,jdbcType=VARCHAR} AND GB.BUTTON_ID=B.ID
+			)
+			OR EXISTS(
+			SELECT 1 FROM AQ_BASIC_FRAME_USER_GROUP UG 
+			JOIN AQ_BASIC_FRAME_GROUP G ON UG.GROUP_ID = G.ID 
+			JOIN AQ_BASIC_FRAME_ROLE_BUTTON RB ON G.role_ID=Rb.ROLE_ID
+			WHERE UG.USER_ID =#{userId,jdbcType=VARCHAR} AND RB.BUTTON_ID=B.ID
+			)
 		)
 	</select>
 </mapper>