diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiMenuNavAction.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiMenuNavAction.java index fc5b46f1..54f38b60 100644 --- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiMenuNavAction.java +++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiMenuNavAction.java @@ -62,7 +62,7 @@ public class BuiMenuNavAction extends BaseAction { pageEntity.setPag_no(1); pageEntity.setLimit(9999); BuiMenuDO menuDO = new BuiMenuDO(); - List list = buiMenuMapper.selectPage(pageEntity, menuDO); + List list = buiMenuMapper.selectMenuPage(pageEntity, menuDO); List list2 = PUBUtils.menuProc1(list); diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/common/PUBUtils.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/common/PUBUtils.java index 238ed368..f1ce5068 100644 --- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/common/PUBUtils.java +++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/common/PUBUtils.java @@ -9,6 +9,8 @@ import com.yuangou.ecp.bp.core.common.message.YGBizMessage; import com.yuangou.ecp.bp.core.common.message.YGBizMessageContext; import com.yuangou.ecp.bp.core.common.message.YGEDB; import com.yuangou.ecp.bp.core.common.yglib.YGATLParam; +import com.yuangou.ecp.bp.core.common.yglog4j.Logger; +import com.yuangou.ecp.bp.core.common.yglog4j.YGLogger; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; @@ -37,25 +39,15 @@ public class PUBUtils { } BuiMenuDTO menuDTO = new BuiMenuDTO(); BeanUtils.copyProperties(menuDO, menuDTO); - if( "0".equals(menuDTO.getMenuId())) { + if( menuDTO.getMenuId() == 0) { list.add(menuDTO); continue; } BuiMenuDTO parentMenuDTO = getParentMenuDTO(list, parentId); if (parentMenuDTO == null) { - BuiMenuDO parentMenuDO = geParentMenuDO(menus, parentId); - if (parentMenuDO == null) { - // root - list.add(menuDTO); - continue; - } else { - parentMenuDTO = new BuiMenuDTO(); - BeanUtils.copyProperties(parentMenuDO, parentMenuDTO); - list.add(parentMenuDTO); - } + throw new IllegalArgumentException("menu:[" + menuDO.getName() + "] not found parent:[" + menuDO.getParentName() + "]"); } - List list1 = parentMenuDTO.getList(); list1.add(menuDTO); } @@ -181,23 +173,4 @@ public class PUBUtils { root.setData(arrNam + "_num", String.valueOf(tmp1s.length)); return 1; } -// public static String getPermissions(List menus) { -// List permissions = new ArrayList(); -// for (BuiMenuDO menuDO : menus) { -// String perms = menuDO.getPerms(); -// if (StringUtils.isNotBlank(perms)) { -// String[] values = StringUtils.split(perms, ","); -// for (String value : values) { -// if (!permissions.contains(value)) { -// permissions.add(value); -// } -// } -// } -// if (2 == menuDO.getType()) { -// continue; -// } -// } - -// return StringUtils.join(permissions, "|"); -// } } diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiMenuMapper.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiMenuMapper.java index b1a9a7dd..37ddf8e0 100644 --- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiMenuMapper.java +++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiMenuMapper.java @@ -39,5 +39,6 @@ public interface BuiMenuMapper { int deleteByIdCascade(Long menuId); + List selectMenuPage(YGPageEntity pageEntity, BuiMenuDO entity); } diff --git a/ecp-mbu-web/src/main/resources/app/mbu/etc/pub/mapper/BuiMenuMapper.xml b/ecp-mbu-web/src/main/resources/app/mbu/etc/pub/mapper/BuiMenuMapper.xml index e68c6c6a..9be03bd6 100644 --- a/ecp-mbu-web/src/main/resources/app/mbu/etc/pub/mapper/BuiMenuMapper.xml +++ b/ecp-mbu-web/src/main/resources/app/mbu/etc/pub/mapper/BuiMenuMapper.xml @@ -142,4 +142,10 @@ delete from t_bui_menu where menu_id in (select menu_id from t_bui_menu start with menu_id=${menuId} connect by prior menu_id = parent_id) + + +