作者 陈志颖

fix:修复新增兑换素币清单员工判断

@@ -992,7 +992,7 @@ func (cashPoolService *CashPoolService) CreateExchangeCashPerson(createExchangeC @@ -992,7 +992,7 @@ func (cashPoolService *CashPoolService) CreateExchangeCashPerson(createExchangeC
992 // 判断当前员工是否已经在素币兑换清单中 992 // 判断当前员工是否已经在素币兑换清单中
993 count, _, err := exchangeCashPersonListRepository.Find(map[string]interface{}{ 993 count, _, err := exchangeCashPersonListRepository.Find(map[string]interface{}{
994 "uid": employeeFound.EmployeeInfo.Uid, 994 "uid": employeeFound.EmployeeInfo.Uid,
995 - "activityId": activityFound.ActivityId, 995 + "exchangeCashActivityId": activityFound.ActivityId,
996 }) 996 })
997 if err != nil { 997 if err != nil {
998 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 998 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
@@ -398,6 +398,7 @@ func (controller *SuMoneyController) ImportExchangeList () { @@ -398,6 +398,7 @@ func (controller *SuMoneyController) ImportExchangeList () {
398 operator, _ := controller.GetInt64("operator") 398 operator, _ := controller.GetInt64("operator")
399 file, h, _ := controller.GetFile("file") //获取上传的文件 399 file, h, _ := controller.GetFile("file") //获取上传的文件
400 ext := path.Ext(h.Filename) 400 ext := path.Ext(h.Filename)
  401 + // 文件后缀名校验
401 AllowExtMap := map[string]bool{ 402 AllowExtMap := map[string]bool{
402 ".xlsx":true, 403 ".xlsx":true,
403 } 404 }
@@ -410,7 +411,7 @@ func (controller *SuMoneyController) ImportExchangeList () { @@ -410,7 +411,7 @@ func (controller *SuMoneyController) ImportExchangeList () {
410 fmt.Println(err) 411 fmt.Println(err)
411 return 412 return
412 } 413 }
413 - // TODO 增加非空校验,导入失败原因返回 414 + // 记录非空校验
414 var response utils.JsonResponse 415 var response utils.JsonResponse
415 dataList := make([]interface{}, 0) 416 dataList := make([]interface{}, 0)
416 rows, _ := xlsx.GetRows("Sheet1") 417 rows, _ := xlsx.GetRows("Sheet1")