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-auth/src/main/resources/mapper/UserMapper.xml | 2 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 2 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.xml | 2 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java | 2 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java | 6 +++---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/task/ScheduledTask.java | 4 ++--
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/runner/StartedUpRunner.java | 2 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml | 8 ++++----
febs-server/febs-server-hr/src/main/resources/bootstrap.yml | 2 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 2 +-
10 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/febs-auth/src/main/resources/mapper/UserMapper.xml b/febs-auth/src/main/resources/mapper/UserMapper.xml
index f4d2d30..2c0b819 100644
--- a/febs-auth/src/main/resources/mapper/UserMapper.xml
+++ b/febs-auth/src/main/resources/mapper/UserMapper.xml
@@ -26,7 +26,7 @@
LEFT JOIN t_role r ON r.role_id = ur.role_id
WHERE u.username = #{username} and status = 1
group by u.username,u.user_id,u.email,u.mobile,u.password, u.status,u.create_time,u.ssex,u.dept_id
- ,u.last_login_time,u.modify_time,u.description,u.avatar
+ ,u.last_login_time,u.modify_time,u.description,u.avatar,d.dept_name
</select>
<select id="findUserDataPermissions" parameterType="long" resultType="userDataPermission">
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
index e8c0388..daa2fa6 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
@@ -33,7 +33,7 @@
* @since JDK1.8
*/
@Data
-@TableName("t_emp_baseInfo")
+@TableName("t_emp_baseinfo")
@Excel("员工基本信息表")
public class EmpBaseInfo implements Serializable {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
index 4c528c0..090b71b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
@@ -30,7 +30,7 @@
* @since JDK1.8
*/
@Data
-@TableName("t_emp_workExperience")
+@TableName("t_emp_workexperience")
@Excel("员工工作经历")
public class EmpWorkExperience implements Serializable {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
index b22df99..b4d6284 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
@@ -7,12 +7,12 @@
</select>
<select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
- select a.* from t_emp_baseInfo a
+ select a.* from t_emp_baseinfo a
inner join t_dept c on a.deptId = c.DEPT_ID
${ew.customSqlSegment}
</select>
<select id="listAll" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
- select a.* from t_emp_baseInfo a
+ select a.* from t_emp_baseinfo a
inner join t_dept c on a.deptId = c.DEPT_ID
${ew.customSqlSegment}
</select>
@@ -431,7 +431,7 @@
SELECT
count(1) ygtg
FROM
- t_emp_baseinfo t right JOIN t_emp_jobChange t2 on t.empId=t2.empId inner join t_dept t1 on t.deptId=t1.DEPT_ID ${ew.customSqlSegment} and t.delFlag=0 and t2.delFlag=0
+ t_emp_baseinfo t right JOIN t_emp_jobchange t2 on t.empId=t2.empId inner join t_dept t1 on t.deptId=t1.DEPT_ID ${ew.customSqlSegment} and t.delFlag=0 and t2.delFlag=0
<choose>
<when test="index==0">
and TO_DAYS(t2.changeDate) = TO_DAYS(NOW())
@@ -1148,7 +1148,7 @@
SELECT
t1.*,t.empNumb,t.deptName,t.certificateNumb,t.allDeptName
FROM
- t_emp_baseinfo t right JOIN t_emp_jobChange t1 on t.empId=t1.empId inner join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1 and t2.DEPT_ID in
+ t_emp_baseinfo t right JOIN t_emp_jobchange t1 on t.empId=t1.empId inner join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1 and t2.DEPT_ID in
<foreach item="item" index="index" collection="list" open="(" separator="," close=")">
#{item}
</foreach> and t.delFlag=0 and t1.delFlag=0
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java
index 2b98662..eacb661 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java
@@ -35,7 +35,7 @@
* @author: 2021-01-28 12:33:31
*/
@Update("<script> " +
- " UPDATE t_emp_workExperience SET delFlag = 1,\n" +
+ " UPDATE t_emp_workexperience SET delFlag = 1,\n" +
" modifyTime = NOW(),\n" +
" modifier = #{operatorId}, \n" +
" version = version+1 \n" +
@@ -47,7 +47,7 @@
void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
@Update("<script> " +
- " UPDATE t_emp_workExperience SET delFlag = 0,\n" +
+ " UPDATE t_emp_workexperience SET delFlag = 0,\n" +
" modifyTime = NOW(),\n" +
" modifier = #{operatorId}, \n" +
" version = version+1 \n" +
@@ -61,7 +61,7 @@
IPage<EmpWorkExperience> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);
@Update("<script> " +
- " UPDATE t_emp_workExperience SET delFlag = 1,\n" +
+ " UPDATE t_emp_workexperience SET delFlag = 1,\n" +
" modifyTime = NOW(),\n" +
" modifier = #{operatorId}, \n" +
" version = version+1 \n" +
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.xml
index 78f2946..3513f49 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpWorkExperienceMapper">
<select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpWorkExperience">
- select a.*,b.allDeptName from t_emp_workExperience a
+ select a.*,b.allDeptName from t_emp_workexperience a
inner join t_emp_baseinfo b on a.empId = b.empId
inner join t_dept c on a.deptId = c.DEPT_ID
${ew.customSqlSegment}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
index ecaaebd..2b65e56 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
@@ -186,7 +186,7 @@
queryWrapper.orderByAsc("a.certificateNumb");
}
}
- queryWrapper.groupBy(" a.delFlag,a.empName,a.empStatus,a.empId,a.certificateNumb,a.empNumb,deptName,a.jobName");
+ queryWrapper.groupBy(" a.delFlag,a.empName,a.empStatus,a.empId,a.certificateNumb,a.empNumb,deptName,a.jobName,a.deptId");
Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
// String querySql = empAccessoryMapper.getQuerySql();
//List<Label> labelList = labelService.findLabels(new Label());
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/task/ScheduledTask.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/task/ScheduledTask.java
index 2028a8d..ebb91d7 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/task/ScheduledTask.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/task/ScheduledTask.java
@@ -30,7 +30,7 @@
/**
*
* 每天凌晨1点计算一次工龄
- *
+ * <p>
* date 2021-04-27 20:44
* @author: luoyibo
* @return void
@@ -61,7 +61,7 @@
}
@Override
public void run(String... args) throws Exception {
- empBaseInfoService.updateEmpBaseKeyInfo();
+ //empBaseInfoService.updateEmpBaseKeyInfo();
//calculateSeniority();
// autoStopContract();
//autoCalculateAge();
diff --git a/febs-server/febs-server-hr/src/main/resources/bootstrap.yml b/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
index 621e447..052ea73 100644
--- a/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
+++ b/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@
config:
server-addr: ${nacos.url}:8848
group: DEFAULT_GROUP
- prefix: febs-server-Hr
+ prefix: febs-server-hr
file-extension: yaml
discovery:
server-addr: ${nacos.url}:8848
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/runner/StartedUpRunner.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/runner/StartedUpRunner.java
index 3077daa..2715f38 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/runner/StartedUpRunner.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/runner/StartedUpRunner.java
@@ -1,7 +1,6 @@
package cc.mrbird.febs.server.system.runner;
import cc.mrbird.febs.common.core.utils.FebsUtil;
-import cc.mrbird.febs.server.system.service.IDicItemService;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
@@ -26,3 +25,4 @@
}
}
}
+
--
Gitblit v1.8.0