From 1029d5966b076d6f1774717abce63a25f8a4eee7 Mon Sep 17 00:00:00 2001 From: Frudrax Cheng Date: Tue, 26 May 2026 10:41:01 +0800 Subject: [PATCH] Fix leftover department references after rename to position FindAll search query and tests still referenced the old column name, causing vet errors and runtime SQL failures. Co-Authored-By: Claude Opus 4.7 (1M context) --- services/employees_service.go | 4 ++-- services/services_test.go | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/services/employees_service.go b/services/employees_service.go index ae9c8f4..5cd5826 100644 --- a/services/employees_service.go +++ b/services/employees_service.go @@ -117,14 +117,14 @@ func (s *EmployeeSerialsService) FindAll(page int, limit int, search string) ([] // 搜索条件 if search != "" { - db = db.Where("serial_number LIKE ? OR company_name LIKE ? OR department LIKE ? OR employee_name LIKE ?", + db = db.Where("serial_number LIKE ? OR company_name LIKE ? OR position LIKE ? OR employee_name LIKE ?", "%"+search+"%", "%"+search+"%", "%"+search+"%", "%"+search+"%") } // 获取总数 countQuery := db.Model(&models.EmployeeSerial{}) if search != "" { - countQuery = countQuery.Where("serial_number LIKE ? OR company_name LIKE ? OR department LIKE ? OR employee_name LIKE ?", + countQuery = countQuery.Where("serial_number LIKE ? OR company_name LIKE ? OR position LIKE ? OR employee_name LIKE ?", "%"+search+"%", "%"+search+"%", "%"+search+"%", "%"+search+"%") } countQuery.Count(&total) diff --git a/services/services_test.go b/services/services_test.go index a77c955..434a5f6 100644 --- a/services/services_test.go +++ b/services/services_test.go @@ -429,13 +429,13 @@ func TestEmployeeSerialsService_Generate_Success(t *testing.T) { database.DB.Create(&user) service := EmployeeSerialsService{} - serials, err := service.Generate("EmpTestCompany", "技术部", "张三", 5, user.ID) + serials, err := service.Generate("EmpTestCompany", "技术部", "张三", 5, user.ID, "") assert.NoError(t, err) assert.Len(t, serials, 5) for _, serial := range serials { assert.Equal(t, "EmpTestCompany", serial.CompanyName) - assert.Equal(t, "技术部", serial.Department) + assert.Equal(t, "技术部", serial.Position) assert.Equal(t, "张三", serial.EmployeeName) assert.True(t, serial.IsActive) assert.True(t, strings.HasPrefix(serial.SerialNumber, "EMP")) @@ -459,7 +459,7 @@ func TestEmployeeSerialsService_Generate_CreateNewCompany(t *testing.T) { database.DB.Create(&user) service := EmployeeSerialsService{} - serials, err := service.Generate("NewEmpCompany", "市场部", "李四", 3, user.ID) + serials, err := service.Generate("NewEmpCompany", "市场部", "李四", 3, user.ID, "") assert.NoError(t, err) assert.Len(t, serials, 3) @@ -490,7 +490,7 @@ func TestEmployeeSerialsService_Query_Success(t *testing.T) { database.DB.Create(&user) service := EmployeeSerialsService{} - serials, _ := service.Generate("QueryEmpCompany", "财务部", "王五", 1, user.ID) + serials, _ := service.Generate("QueryEmpCompany", "财务部", "王五", 1, user.ID, "") serialNumber := serials[0].SerialNumber result, err := service.Query(serialNumber) @@ -499,7 +499,7 @@ func TestEmployeeSerialsService_Query_Success(t *testing.T) { assert.NotNil(t, result) assert.Equal(t, strings.ToUpper(serialNumber), strings.ToUpper(result.SerialNumber)) assert.Equal(t, "QueryEmpCompany", result.CompanyName) - assert.Equal(t, "财务部", result.Department) + assert.Equal(t, "财务部", result.Position) assert.Equal(t, "王五", result.EmployeeName) assert.True(t, result.IsActive) @@ -531,7 +531,7 @@ func TestEmployeeSerialsService_FindAll_Success(t *testing.T) { database.DB.Create(&user) service := EmployeeSerialsService{} - serials, _ := service.Generate("ListEmpCompany", "人事部", "赵六", 10, user.ID) + serials, _ := service.Generate("ListEmpCompany", "人事部", "赵六", 10, user.ID, "") result, total, totalPages, err := service.FindAll(1, 5, "") @@ -560,7 +560,7 @@ func TestEmployeeSerialsService_FindAll_WithSearch(t *testing.T) { database.DB.Create(&user) service := EmployeeSerialsService{} - serials, _ := service.Generate("SearchEmpCompany", "研发部", "钱七", 5, user.ID) + serials, _ := service.Generate("SearchEmpCompany", "研发部", "钱七", 5, user.ID, "") result, _, _, err := service.FindAll(1, 10, "SearchEmpCompany") @@ -596,14 +596,14 @@ func TestEmployeeSerialsService_Update_Success(t *testing.T) { database.DB.Create(&user) service := EmployeeSerialsService{} - serials, _ := service.Generate("UpdateEmpCompany", "运营部", "孙八", 1, user.ID) + serials, _ := service.Generate("UpdateEmpCompany", "运营部", "孙八", 1, user.ID, "") serialNumber := serials[0].SerialNumber isActive := false updateData := models.UpdateEmployeeSerialDTO{ CompanyName: "UpdatedEmpCompany", - Department: "新部门", + Position: "新部门", EmployeeName: "新名字", IsActive: &isActive, } @@ -613,7 +613,7 @@ func TestEmployeeSerialsService_Update_Success(t *testing.T) { assert.NoError(t, err) assert.NotNil(t, result) assert.Equal(t, "UpdatedEmpCompany", result.CompanyName) - assert.Equal(t, "新部门", result.Department) + assert.Equal(t, "新部门", result.Position) assert.Equal(t, "新名字", result.EmployeeName) assert.False(t, result.IsActive) @@ -650,7 +650,7 @@ func TestEmployeeSerialsService_Revoke_Success(t *testing.T) { database.DB.Create(&user) service := EmployeeSerialsService{} - serials, _ := service.Generate("RevokeEmpCompany", "测试部", "周九", 1, user.ID) + serials, _ := service.Generate("RevokeEmpCompany", "测试部", "周九", 1, user.ID, "") serialNumber := serials[0].SerialNumber err := service.Revoke(serialNumber) @@ -689,7 +689,7 @@ func TestEmployeeSerialsService_Revoke_AlreadyRevoked(t *testing.T) { database.DB.Create(&user) service := EmployeeSerialsService{} - serials, _ := service.Generate("RevokeEmpCompany2", "行政部", "吴十", 1, user.ID) + serials, _ := service.Generate("RevokeEmpCompany2", "行政部", "吴十", 1, user.ID, "") serialNumber := serials[0].SerialNumber service.Revoke(serialNumber) @@ -718,7 +718,7 @@ func TestEmployeeSerialsService_GenerateQRCode_Success(t *testing.T) { database.DB.Create(&user) service := EmployeeSerialsService{} - serials, _ := service.Generate("QREmpCompany", "产品部", "郑十一", 1, user.ID) + serials, _ := service.Generate("QREmpCompany", "产品部", "郑十一", 1, user.ID, "") serialNumber := serials[0].SerialNumber qrCodeBase64, queryUrl, err := service.GenerateQRCode(serialNumber, "", "localhost:3000", "http") @@ -757,7 +757,7 @@ func TestEmployeeSerialsService_GenerateQRCode_Inactive(t *testing.T) { database.DB.Create(&user) service := EmployeeSerialsService{} - serials, _ := service.Generate("QREmpCompany2", "设计部", "王十二", 1, user.ID) + serials, _ := service.Generate("QREmpCompany2", "设计部", "王十二", 1, user.ID, "") serialNumber := serials[0].SerialNumber service.Revoke(serialNumber) @@ -790,7 +790,7 @@ func TestCompaniesService_GetStatsOverview_Success(t *testing.T) { companySerials, _ := serialService.Generate("StatsCompany", 2, 30, user.ID, "STAT") employeeSerialsService := EmployeeSerialsService{} - employeeSerials, _ := employeeSerialsService.Generate("StatsCompany", "技术部", "测试员工", 2, user.ID) + employeeSerials, _ := employeeSerialsService.Generate("StatsCompany", "技术部", "测试员工", 2, user.ID, "") _ = serialService.Revoke(companySerials[0].SerialNumber) _ = employeeSerialsService.Revoke(employeeSerials[0].SerialNumber)