Merge remote-tracking branches 'remotes/origin/dev_check' and 'remotes/origin/wxz_oper_access' into 烟台master

epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperMenuDao.xml

@@ -28,7 +28,7 @@
         and lang.table_id=t3.id and lang.language=#{language}) as name from oper_role_user t1
         left join oper_role_menu t2 on (t1.role_id = t2.role_id AND t2.del_flag = 0)
         left join oper_menu t3 on (t2.menu_id = t3.id)
-        where t1.user_id = #{userId} AND t1.del_flag = 0 and t3.del_flag = 0
+        where t1.user_id = #{userId} AND t1.del_flag = 0 and t3.del_flag = 0 and t2.DEL_FLAG = 0
         <if test="type != null">
             and t3.type = #{type}
         </if>

epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperRoleMenuDao.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.epmet.dao.OperRoleMenuDao">
 
     <select id="getMenuIdList" resultType="java.lang.String">
-        select menu_id from oper_role_menu where role_id = #{value}
+        select menu_id from oper_role_menu where del_flag = 0 AND role_id = #{value}
     </select>
 
     <update id="deleteByRoleIds">