From a76fc7a6f92a081d6e9f899675bae9f121d53cc0 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期三, 15 十二月 2021 10:50:13 +0800
Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phi_platform

---
 phi_platform_user/src/main/java/com/hx/phip/deduction/service/impl/DeductionSingleServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/phi_platform_user/src/main/java/com/hx/phip/deduction/service/impl/DeductionSingleServiceImpl.java b/phi_platform_user/src/main/java/com/hx/phip/deduction/service/impl/DeductionSingleServiceImpl.java
index 8205f4b..a38ee61 100644
--- a/phi_platform_user/src/main/java/com/hx/phip/deduction/service/impl/DeductionSingleServiceImpl.java
+++ b/phi_platform_user/src/main/java/com/hx/phip/deduction/service/impl/DeductionSingleServiceImpl.java
@@ -139,7 +139,6 @@
             }
 
             deductionSingle.setUserId(userProject.getUserId());
-            deductionSingle.setType(DeductionSingleConstants.TYPE_SELF_ADD);
             deductionSingle.setSourceCode(deductionDto.getSourceCode());
             deductionSingle.setSourceName(deductionDto.getSourceName());
             deductionSingle.setStatus(DeductionSingleConstants.STATUS_DONE_EXECUTE);
@@ -147,6 +146,8 @@
 
             // 鏄惁娣诲姞鏁版嵁
             if(type == BaseEntity.YES) {
+                // 鍒掓墸榛樿绫诲瀷
+                deductionSingle.setType(deductionDto.getType());
                 int count = deductionSingleMapper.insert(deductionSingle);
                 if (count != 1) {
                     throw new TipsException("鏂板澶辫触锛�");

--
Gitblit v1.8.0