|
...
|
...
|
@@ -1218,7 +1218,7 @@ func (cashPoolService *CashPoolService) UpdateExchangeCashPerson(updateExchangeC |
|
|
|
activityFoundExchangedSuMoney := activityFound.ExchangedSuMoney
|
|
|
|
activityFoundExchangedCash := activityFound.ExchangedCash
|
|
|
|
|
|
|
|
// 判断当前员工是否有效
|
|
|
|
// TODO 更改：根据uid和companyId，判断当前员工是否有效
|
|
|
|
getEmployee := map[string]interface{}{
|
|
|
|
"account": personFound.EmployeeInfo.EmployeeAccount,
|
|
|
|
"companyId": activityFound.CompanyId,
|
|
...
|
...
|
@@ -1535,7 +1535,7 @@ func (cashPoolService *CashPoolService) ImportCreateExchangeCashPerson(createExc |
|
|
|
cashPoolFoundUnExchangeCash := cashPoolFound.UnExchangeCash // 当前公司现金池未兑换现金
|
|
|
|
cashPoolFoundExchangedCash := cashPoolFound.ExchangedCash // 当前公司现金池已兑换现金
|
|
|
|
|
|
|
|
// 判断当前员工是否有效
|
|
|
|
// TODO 更改：根据uid和companyId，判断当前员工是否有效
|
|
|
|
getEmployee := map[string]interface{}{
|
|
|
|
"account": createExchangeCashPersonCommand.PersonAccount,
|
|
|
|
"companyId": activityFound.CompanyId,
|
|
...
|
...
|
@@ -1563,7 +1563,7 @@ func (cashPoolService *CashPoolService) ImportCreateExchangeCashPerson(createExc |
|
|
|
}
|
|
|
|
employeeFoundSuMoney := employeeFound.SuMoney // 当前导入员工持有的素币值
|
|
|
|
|
|
|
|
// 判断当前员工是否已经在素币兑换清单中
|
|
|
|
// TODO 更改：根据uid和activityId判断当前员工是否已经在素币兑换清单中，
|
|
|
|
personFound, _ := exchangeCashPersonListRepository.FindOne(map[string]interface{}{
|
|
|
|
"employeeAccount": employeeFound.EmployeeInfo.EmployeeAccount,
|
|
|
|
"activityId": activityFound.ActivityId,
|
...
|
...
|
|
