huangjn пре 3 година
родитељ
комит
e8c8da570f

+ 7 - 1
blade-service/blade-business/src/main/java/org/springblade/business/controller/MessageWarningController.java

@@ -31,6 +31,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.manager.entity.TableFile;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.feign.IDictBizClient;
 import org.springframework.web.bind.annotation.*;
@@ -39,6 +40,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.business.service.IMessageWarningService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -64,7 +66,11 @@ public class MessageWarningController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "获取消息类型(左侧菜单)")
 	public R<List<DictBiz>> queryMessageType() {
-		return this.dictBizClient.getList("business_message_type", "notRoot");
+		List<DictBiz> dictBizs = this.dictBizClient.getList("business_message_type", "notRoot").getData();
+		if(dictBizs != null && dictBizs.size() > 0){
+			dictBizs.sort(Comparator.comparing(DictBiz::getSort));
+		}
+		return R.data(dictBizs);
 	}
 
 	/**