大屏需求修改

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

@@ -110,7 +110,7 @@ public class KwsMenuService {
             if (!Objects.isNull(params.getSort())) {
                 moveSort(params);
             }
-            params.setUsingRoles(parent.getUsingRoles());
+          //  params.setUsingRoles(parent.getUsingRoles());
         }
 
         //新增菜单时，如果已经有同级菜单，则序号为最大的序号+1
@@ -643,7 +643,7 @@ public class KwsMenuService {
 //            if (Boolean.TRUE.equals(reqVo.getIncludeButton())) {
 //
 //            }
-            finalList = supplementButtons(finalList, findMenuTreePojo.getEntTypeList());
+            finalList = supplementButtons(finalList, findMenuTreePojo.getEntTypeList(),Integer.valueOf(reqVo.getClientType()));
         }
 
 
@@ -723,7 +723,7 @@ public class KwsMenuService {
      * 查询所有菜单类型节点（type=1）的子按钮（type=2），
      * 合并到列表中以便递归构建包含按钮的完整树。
      */
-    private List<KwsMenuResVo> supplementButtons(List<KwsMenuResVo> menuList, List<String> entTypeList) {
+    private List<KwsMenuResVo> supplementButtons(List<KwsMenuResVo> menuList, List<String> entTypeList, Integer clientType) {
         List<Long> menuTypeIds = menuList.stream()
                 .filter(m -> Objects.equals(m.getType(), MenuTypeEnum.DIRECTORY.getCode()))
                 .map(KwsMenuResVo::getId)
@@ -736,6 +736,7 @@ public class KwsMenuService {
                 .eq(KwsMenu::getDelFlag, Global.NO)
                 .eq(KwsMenu::getType, MenuTypeEnum.BUTTON.getCode())
                 .in(KwsMenu::getParentId, menuTypeIds)
+                .eq(KwsMenu::getClientType, clientType) // 确保按钮与菜单属于同一客户端
                 .orderByAsc(KwsMenu::getSort);
         appendUsingRolesFilter(buttonWrapper, entTypeList);
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtWaybillOrderSubtaskRepository.java

@@ -73,7 +73,7 @@ public class KwtWaybillOrderSubtaskRepository extends ServiceImpl<KwtWaybillOrde
                 Wrappers.<KwtWaybillOrderSubtask>lambdaQuery()
                         .eq(BaseModel::getDelFlag,0)
                         .eq(Objects.nonNull( status),KwtWaybillOrderSubtask::getStatus, status)
-                        .in(CollectionUtils.isNotEmpty( waybillOrderStatus),KwtWaybillOrderSubtask::getStatus, waybillOrderStatus)
+                        .notIn(CollectionUtils.isNotEmpty( waybillOrderStatus),KwtWaybillOrderSubtask::getStatus, waybillOrderStatus)
                         .in(CollectionUtils.isNotEmpty(logOrderIds),KwtWaybillOrderSubtask::getLOrderId, logOrderIds)
                         .in(CollectionUtils.isNotEmpty(billOrderIds),KwtWaybillOrderSubtask::getWOrderId, billOrderIds)
                         .orderByDesc(BaseModel::getUpdateTime)