Merge remote-tracking branch 'origin/dev_20260131' into dev_20260131

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -2430,8 +2430,8 @@ public class KwoTradeOrderService {
             WalletPrepaidDto walletFreeze = new WalletPrepaidDto();
 //            walletFreeze.setTTradeOrderId(kwoTradeOrder.getId());
             walletFreeze.setOrderNo(kwoTradeOrder.getTOrderNo());
-            walletFreeze.setProEntId(unitMap.get(String.valueOf(CooperateTypeEnum.PURCHASER.getCode())).getEntId());
-            walletFreeze.setSupEntId(unitMap.get(String.valueOf(CooperateTypeEnum.SUPPLIER.getCode())).getEntId());
+            walletFreeze.setProEntId(unitMap.get(String.valueOf(1)).getEntId());
+            walletFreeze.setSupEntId(unitMap.get(String.valueOf(2)).getEntId());
             walletFreeze.setOrderType(4);
             walletFreeze.setTradeType(5);
             walletFreeze.setRemark("贸易订单：" + walletFreeze.getOrderNo() + ",审核拒绝解冻");

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsMenuService.java

@@ -643,7 +643,7 @@ public class KwsMenuService {
 //            if (Boolean.TRUE.equals(reqVo.getIncludeButton())) {
 //
 //            }
-            finalList = supplementButtons(finalList);
+            finalList = supplementButtons(finalList, findMenuTreePojo.getEntTypeList());
         }
 
 
@@ -723,7 +723,7 @@ public class KwsMenuService {
      * 查询所有菜单类型节点（type=1）的子按钮（type=2），
      * 合并到列表中以便递归构建包含按钮的完整树。
      */
-    private List<KwsMenuResVo> supplementButtons(List<KwsMenuResVo> menuList) {
+    private List<KwsMenuResVo> supplementButtons(List<KwsMenuResVo> menuList, List<String> entTypeList) {
         List<Long> menuTypeIds = menuList.stream()
                 .filter(m -> Objects.equals(m.getType(), MenuTypeEnum.DIRECTORY.getCode()))
                 .map(KwsMenuResVo::getId)
@@ -732,7 +732,14 @@ public class KwsMenuService {
             return menuList;
         }
 
-        List<KwsMenu> buttons = kwsMenuDao.selectByParentIds(menuTypeIds, MenuTypeEnum.BUTTON.getCode());
+        LambdaQueryWrapper<KwsMenu> buttonWrapper = Wrappers.lambdaQuery(KwsMenu.class)
+                .eq(KwsMenu::getDelFlag, Global.NO)
+                .eq(KwsMenu::getType, MenuTypeEnum.BUTTON.getCode())
+                .in(KwsMenu::getParentId, menuTypeIds)
+                .orderByAsc(KwsMenu::getSort);
+        appendUsingRolesFilter(buttonWrapper, entTypeList);
+
+        List<KwsMenu> buttons = kwsMenuMpMapper.selectList(buttonWrapper);
         if (CollectionUtils.isEmpty(buttons)) {
             return menuList;
         }