正在显示
55 个修改的文件
包含
3 行增加
和
3 行删除
| @@ -1218,7 +1218,7 @@ func (cashPoolService *CashPoolService) UpdateExchangeCashPerson(updateExchangeC | @@ -1218,7 +1218,7 @@ func (cashPoolService *CashPoolService) UpdateExchangeCashPerson(updateExchangeC | ||
| 1218 | activityFoundExchangedSuMoney := activityFound.ExchangedSuMoney | 1218 | activityFoundExchangedSuMoney := activityFound.ExchangedSuMoney |
| 1219 | activityFoundExchangedCash := activityFound.ExchangedCash | 1219 | activityFoundExchangedCash := activityFound.ExchangedCash |
| 1220 | 1220 | ||
| 1221 | - // 判断当前员工是否有效 | 1221 | + // TODO 更改：根据uid和companyId，判断当前员工是否有效 |
| 1222 | getEmployee := map[string]interface{}{ | 1222 | getEmployee := map[string]interface{}{ |
| 1223 | "account": personFound.EmployeeInfo.EmployeeAccount, | 1223 | "account": personFound.EmployeeInfo.EmployeeAccount, |
| 1224 | "companyId": activityFound.CompanyId, | 1224 | "companyId": activityFound.CompanyId, |
| @@ -1535,7 +1535,7 @@ func (cashPoolService *CashPoolService) ImportCreateExchangeCashPerson(createExc | @@ -1535,7 +1535,7 @@ func (cashPoolService *CashPoolService) ImportCreateExchangeCashPerson(createExc | ||
| 1535 | cashPoolFoundUnExchangeCash := cashPoolFound.UnExchangeCash // 当前公司现金池未兑换现金 | 1535 | cashPoolFoundUnExchangeCash := cashPoolFound.UnExchangeCash // 当前公司现金池未兑换现金 |
| 1536 | cashPoolFoundExchangedCash := cashPoolFound.ExchangedCash // 当前公司现金池已兑换现金 | 1536 | cashPoolFoundExchangedCash := cashPoolFound.ExchangedCash // 当前公司现金池已兑换现金 |
| 1537 | 1537 | ||
| 1538 | - // 判断当前员工是否有效 | 1538 | + // TODO 更改：根据uid和companyId，判断当前员工是否有效 |
| 1539 | getEmployee := map[string]interface{}{ | 1539 | getEmployee := map[string]interface{}{ |
| 1540 | "account": createExchangeCashPersonCommand.PersonAccount, | 1540 | "account": createExchangeCashPersonCommand.PersonAccount, |
| 1541 | "companyId": activityFound.CompanyId, | 1541 | "companyId": activityFound.CompanyId, |
| @@ -1563,7 +1563,7 @@ func (cashPoolService *CashPoolService) ImportCreateExchangeCashPerson(createExc | @@ -1563,7 +1563,7 @@ func (cashPoolService *CashPoolService) ImportCreateExchangeCashPerson(createExc | ||
| 1563 | } | 1563 | } |
| 1564 | employeeFoundSuMoney := employeeFound.SuMoney // 当前导入员工持有的素币值 | 1564 | employeeFoundSuMoney := employeeFound.SuMoney // 当前导入员工持有的素币值 |
| 1565 | 1565 | ||
| 1566 | - // 判断当前员工是否已经在素币兑换清单中 | 1566 | + // TODO 更改：根据uid和activityId判断当前员工是否已经在素币兑换清单中， |
| 1567 | personFound, _ := exchangeCashPersonListRepository.FindOne(map[string]interface{}{ | 1567 | personFound, _ := exchangeCashPersonListRepository.FindOne(map[string]interface{}{ |
| 1568 | "employeeAccount": employeeFound.EmployeeInfo.EmployeeAccount, | 1568 | "employeeAccount": employeeFound.EmployeeInfo.EmployeeAccount, |
| 1569 | "activityId": activityFound.ActivityId, | 1569 | "activityId": activityFound.ActivityId, |
-
请 注册 或 登录 后发表评论