Merge branch 'yhg_240730'

internal/logic/employee/get_employee_list_logic.go

@@ -86,8 +86,8 @@ func (l *GetEmployeeListLogic) GetEmployeeList(req *types.EmployeeListReq) (*typ
 			})
 		}
 
-		sceneList := getEmployeeConfigListByIds(l, v.Scene)
-		switchInList := getEmployeeConfigListByIds(l, v.SwitchIn)
+		//sceneList := getEmployeeConfigListByIds(l, v.Scene)
+		//switchInList := getEmployeeConfigListByIds(l, v.SwitchIn)
 
 		resp.Data.Data = append(resp.Data.Data,
 			types.EmployeeInfo{
@@ -107,13 +107,13 @@ func (l *GetEmployeeListLogic) GetEmployeeList(req *types.EmployeeListReq) (*typ
 				Skill:            &v.Skill,
 				AbilityType:      &v.AbilityType,
 				Scene:            &v.Scene,
-				SceneList:        sceneList,
-				SwitchIn:         &v.SwitchIn,
-				SwitchInList:     switchInList,
-				Tutorial:         tutorial,
-				VideoUrl:         &v.VideoURL,
-				WorkExperience:   workExperience,
-				CategoryId:       &v.CategoryID,
+				//SceneList:        sceneList,
+				SwitchIn: &v.SwitchIn,
+				//SwitchInList:     switchInList,
+				//Tutorial:         tutorial,
+				VideoUrl: &v.VideoURL,
+				//WorkExperience:   workExperience,
+				CategoryId: &v.CategoryID,
 			})
 	}
 

internal/logic/employee/get_employee_search_logic.go

@@ -84,8 +84,8 @@ func (l *GetEmployeeSearchLogic) GetEmployeeSearch(req *types.EmployeeListReq) (
 			})
 		}
 
-		sceneList := getEmployeeConfig(l, v.Scene)
-		switchInList := getEmployeeConfig(l, v.SwitchIn)
+		//sceneList := getEmployeeConfig(l, v.Scene)
+		//switchInList := getEmployeeConfig(l, v.SwitchIn)
 
 		resp.Data.Data = append(resp.Data.Data,
 			types.EmployeeInfo{
@@ -105,13 +105,13 @@ func (l *GetEmployeeSearchLogic) GetEmployeeSearch(req *types.EmployeeListReq) (
 				Skill:            &v.Skill,
 				AbilityType:      &v.AbilityType,
 				Scene:            &v.Scene,
-				SceneList:        sceneList,
-				SwitchIn:         &v.SwitchIn,
-				SwitchInList:     switchInList,
-				Tutorial:         tutorial,
-				VideoUrl:         &v.VideoURL,
-				WorkExperience:   workExperience,
-				CategoryId:       &v.CategoryID,
+				//SceneList:        sceneList,
+				SwitchIn: &v.SwitchIn,
+				//SwitchInList:     switchInList,
+				//Tutorial:         tutorial,
+				VideoUrl: &v.VideoURL,
+				//WorkExperience:   workExperience,
+				CategoryId: &v.CategoryID,
 			})
 	}