From d89118c8c2f83e4d39f05b774e9019141f0a6341 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期三, 24 九月 2025 09:35:11 +0800
Subject: [PATCH] fix: 修复数据库表名大小写不一致问题及SQL查询错误

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java
index a06ba80..cf32aa5 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java
@@ -53,8 +53,11 @@
     @Override
     public List<Label> findLabels(Label label) {
         LambdaQueryWrapper<Label> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select(Label::getLabelcode, Label::getLabelname, Label::getLabelid).eq(Label::getDelFlag, 0);
-        return this.baseMapper.selectList(queryWrapper);
+        if (StrUtil.isNotBlank(label.getLabelcode())){
+            queryWrapper.select(Label::getLabelcode, Label::getLabelcode, Label::getLabelid);
+        }
+        queryWrapper.eq(Label::getDelFlag, 0).orderByAsc(Label::getSort);
+        return this.list(queryWrapper);
     }
 
     @Override

--
Gitblit v1.8.0