BUG对应

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

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/mappers/MenuModelMapper.java

@@ -16,6 +16,13 @@ public interface MenuModelMapper extends BaseMapper<MenuModel> {
     List<MenuModel> selectMenuTree();
 
     /**
+     * 꿴璂놓迦뺏꽉데（벵객큐）
+     * 
+     * @return
+     */
+    List<MenuModel> selectMenuBtnTree();
+
+    /**
      * 몽앴만꽉데ID�뇜밑젬돨綾꽉데
      * 
      * @param pid

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/MenuService.java

@@ -11,7 +11,7 @@ import com.xt.js.gkaq.frame.model.MenuModel;
  */
 public interface MenuService extends BaseUUIDModelService<MenuModel> {
 
-    public List<MenuModel> initMenuTree();
+    public List<MenuModel> initMenuTree(boolean btnFlag);
 
     public int deleteByPid(String pid);
 

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/MenuServiceImpl.java

@@ -22,7 +22,10 @@ public class MenuServiceImpl extends BaseUUIDModelServiceImpl<MenuModel> impleme
         return mapper;
     }
 
-    public List<MenuModel> initMenuTree() {
+    public List<MenuModel> initMenuTree(boolean btnFlag) {
+        if (btnFlag) {
+            return mapper.selectMenuBtnTree();
+        }
         return mapper.selectMenuTree();
     }
 

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

@@ -68,6 +68,13 @@
     select ID, PID, NAME, CODE, LEAF, SORTNO
     from AQ_BASIC_FRAME_MENU
     where STATE != #{STATE_DEL}
+    order by SORTNO
+  </select>
+  <select id="selectMenuBtnTree" resultMap="BaseResultMap" >
+  	<bind name="STATE_DEL" value="@com.xt.js.gkaq.common.BaseUUIDModel@STATE_DELETE"/>
+    select ID, PID, NAME, CODE, LEAF, SORTNO
+    from AQ_BASIC_FRAME_MENU
+    where STATE != #{STATE_DEL}
     union all
     select ID, MENU PID, NAME, CODE, 'B' LEAF, SORTNO
     from AQ_BASIC_FRAME_BUTTON

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

@@ -70,6 +70,7 @@
   	<bind name="STATE_DEL" value="@com.xt.js.gkaq.common.BaseUUIDModel@STATE_DELETE"/>
 	select CODE, NAME from AQ_BASIC_FRAME_XZQHDM
 	where STATE != #{STATE_DEL}
+	and CODE like #{code,jdbcType=VARCHAR}
 	order by XH
   </select>
 </mapper>