Merge branch '1.0' of 192.168.2.80:/srv/git/pre_parameter into 1.0

cbkj_web_parameter/src/main/resources/mappers/sysApp/SysAppMapper.xml

@@ -163,10 +163,10 @@
         </if>
         order by sort asc
     </select>
-
+ <!--   /*,sort,status,app_desc,update_date,update_user,update_user_name*/-->
     <select id="getApplist" parameterType="SysApp" resultMap="BaseResultMap">
         SELECT
-        <include refid="Base_Column_List"/>
+        app_id,app_name
         from sys_app
         where status = '1'
         <if test="appId != null  and appId!=''">

cbkj_web_parameter/src/main/resources/mappers/sysApp/SysInstitutionMapper.xml

@@ -323,6 +323,9 @@
         FROM sys_institution
         where ins_parent_code = #{insParentCode};
     </select>
+ <!--   <if test="isSj != null and isSj!='' ">
+        and INS_CATEGORY !='3'
+    </if>-->
     <select id="getSysInstitutionByOryCateGory" parameterType="SysInstitution" resultMap="BaseResultMap">
         SELECT INS_ID,INS_CODE,INS_NAME, ins_parent_code
         from sys_institution
@@ -331,9 +334,6 @@
         <if test="insCategory != null and insCategory!='' ">
             and INS_CATEGORY = #{insCategory}
         </if>
-        <if test="isSj != null and isSj!='' ">
-            and INS_CATEGORY !='3'
-        </if>
         <!--条件-->
         <if test="appId != null and appId!='' ">
             and APP_ID =#{appId}

cbkj_web_parameter/src/main/resources/mappers/sysMappers/AdminMenuMapper.xml

@@ -68,7 +68,7 @@
   </sql>
 
     <select id="getMenuByPID" parameterType="Map" resultMap="BaseResultMap">
-        select m.menu_id,m.menu_type ,m.menu_name, m.menu_path, m.parent_menu_id, m.open_type,m.menu_level
+        select m.menu_id,m.menu_type ,m.menu_name,m.sort, m.menu_path, m.parent_menu_id, m.open_type,m.menu_level
         from sys_admin_menu m
         ,sys_admin_rule_menu rm
         ,sys_admin_info_rule ur