From 05c24636a83d733aa51f4b80c708111b38dbd169 Mon Sep 17 00:00:00 2001
From: shichongfu <shi_chongfu@163.com>
Date: 星期一, 21 八月 2023 10:34:39 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-mobile-core/V2.0.0
---
src/main/java/com/product/mobile/core/service/NavBarManagerService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/product/mobile/core/service/NavBarManagerService.java b/src/main/java/com/product/mobile/core/service/NavBarManagerService.java
index e847074..11cc2f0 100644
--- a/src/main/java/com/product/mobile/core/service/NavBarManagerService.java
+++ b/src/main/java/com/product/mobile/core/service/NavBarManagerService.java
@@ -1,5 +1,6 @@
package com.product.mobile.core.service;
+import cn.hutool.core.io.FileUtil;
import com.product.common.lang.StringUtils;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
@@ -14,7 +15,9 @@
import com.product.mobile.core.service.ide.INavBarManagerService;
import com.product.module.sys.entity.SystemUser;
import com.product.util.BaseUtil;
+import com.product.util.sf.img4.util.ImageUtil;
import org.apache.commons.codec.binary.Base64;
+import org.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -157,8 +160,9 @@
sql.append(" a.nav_bar_name, ");
sql.append(" a.module_category, ");
sql.append(" a.uuid ,");
+ sql.append(" b.uuid ,");
sql.append(" a.sequence, ");
- sql.append(" b.route_name ");
+ sql.append(" b.route_name,a.module_sequence ");
sql.append(" order by a.module_sequence,a.sequence");
DataTableEntity dt = getBaseDao().listTable(sql.toString(), new Object[]{});
if (!DataTableEntity.isEmpty(dt)) {
--
Gitblit v1.9.2