ignore

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamManualLedgerController.java

@@ -17,8 +17,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Objects;
-
 /**
  * @Author Joburgess
  * @Date 2020.07.07
@@ -46,9 +44,7 @@ public class ExamManualLedgerController extends BaseController {
         examManualLedger.setTransDirection(TransDirectionEnum.EXPENDITURE);
         examManualLedger.setTenantId(TenantContextHolder.getTenantId());
         examManualLedger.setOperatorUserId(sysUser.getId());
-        if(Objects.nonNull(examManualLedger.getOrganId())){
-            examManualLedger.setOrganId(OrganContextHolder.getOrganId());
-        }
+        examManualLedger.setOrganId(OrganContextHolder.getOrganId());
         examManualLedgerService.addExamManualLedger(examManualLedger);
         return succeed();
     }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamManualLedgerServiceImpl.java

@@ -46,16 +46,16 @@ public class ExamManualLedgerServiceImpl extends BaseServiceImpl<Long, ExamManua
 			throw new BizException("请指定交易金额");
 		}
 		sysUserDao.lockUser(examManualLedger.getOperatorUserId());
-		if(Objects.nonNull(examManualLedger.getOrganId())&&examManualLedger.getOrganId()>0){
-			ExamOrganizationRelation examOrganizationRelation = examOrganizationRelationDao.getExamOrganizationRelation(examManualLedger.getExaminationBasicId(), examManualLedger.getOrganId());
+		if(Objects.nonNull(examManualLedger.getTargetOrganId())&&examManualLedger.getTargetOrganId()>0){
+			ExamOrganizationRelation examOrganizationRelation = examOrganizationRelationDao.getExamOrganizationRelation(examManualLedger.getExaminationBasicId(), examManualLedger.getTargetOrganId());
 			if(Objects.isNull(examOrganizationRelation)){
 				throw new BizException("合作单位信息异常");
 			}
 			examOrganizationRelation.setTotalTransAmount(examOrganizationRelation.getTotalTransAmount().add(examManualLedger.getAmount()));
 			examOrganizationRelationDao.update(examOrganizationRelation);
 		}
-		if(Objects.nonNull(examManualLedger.getOrganId())&&examManualLedger.getOrganId()<=0){
-			examManualLedger.setOrganId(null);
+		if(Objects.nonNull(examManualLedger.getTargetOrganId())&&examManualLedger.getTargetOrganId()<=0){
+			examManualLedger.setTargetOrganId(null);
 		}
 		examManualLedgerDao.insert(examManualLedger);
 	}