优化

src/main/java/com/izouma/nineth/service/AssetService.java

@@ -418,9 +418,9 @@ public class AssetService {
     }
 
     public Page<UserHistory> userHistory(Long userId, PageQuery pageQuery) {
+        Map<String, Object> query = pageQuery.getQuery();
         Page<TokenHistory> page = tokenHistoryRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
             List<Predicate> and = JpaUtils.toPredicates(pageQuery, TokenHistory.class, root, criteriaQuery, criteriaBuilder);
-            Map<String, Object> query = pageQuery.getQuery();
             //String operation = (String) query.get("operation");
             if (ObjectUtils.isEmpty(query.get("toUserId")) && ObjectUtils.isEmpty(query.get("fromUserId"))) {
                 and.add(criteriaBuilder.or(criteriaBuilder.equal(root.get("toUserId"), userId), criteriaBuilder.equal(root.get("fromUserId"), userId)));
@@ -439,7 +439,6 @@ public class AssetService {
 
         Set<String> tokenIds = page.stream().map(TokenHistory::getTokenId).collect(Collectors.toSet());
         List<Asset> assets = tokenIds.isEmpty() ? new ArrayList<>() : assetRepo.findByTokenIdIn(tokenIds);
-        Map<String, Object> query = pageQuery.getQuery();
 
         Page<UserHistory> map = page.map(tokenHistory -> {
             UserHistory userHistory = new UserHistory();

src/main/java/com/izouma/nineth/web/MenuController.java

@@ -60,7 +60,30 @@ public class MenuController extends BaseController {
             if (root.get(i).getId()==3410450||root.get(i).getId()==2396143){
                 root.remove(i);
                 i--;
+            }else {
+                if (root.get(i).getId() == 3410316) {
+                    Menu menu = root.get(i);
+                    List<Menu> children = menu.getChildren();
+                    for (int i1 = 0; i1 < children.size(); i1++) {
+                        if (children.get(i1).getId()==623561) {
+                            children.remove(i1);
+                            i1--;
+                        }
+                    }
+                }else if (root.get(i).getId() == 3252226){
+                    Menu menu = root.get(i);
+                    List<Menu> children = menu.getChildren();
+                    for (int i1 = 0; i1 < children.size(); i1++) {
+                        if (children.get(i1).getId()==3252230) {
+                            children.remove(i1);
+                            i1--;
+                        }
+                    }
+                }
+
+
             }
+
         }
         return root;
     }