From c901ab683ae09146e139bbe95c1ba60cc08fee41 Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Wed, 7 Apr 2021 12:01:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/hrauth/UserLoginMapper.xml      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/UserLoginMapper.xml b/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/UserLoginMapper.xml
index b0a81cb1..34986418 100644
--- a/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/UserLoginMapper.xml
+++ b/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/UserLoginMapper.xml
@@ -48,7 +48,9 @@
         <if test="wechatId != null and wechatId != '' ">
             and hu.wechat_id = #{wechatId}
         </if>
-
+        <if test="type != null">
+            and hu.type = #{type}
+        </if>
     </select>
 
     <select id="selectByPhoneAccount" resultType="com.daqing.framework.domain.hrms.UserEntity">

From 088cf2ee49b52c4951515c41552c58b695dc3c3d Mon Sep 17 00:00:00 2001
From: chen <1251790704@qq.com>
Date: Wed, 7 Apr 2021 16:32:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DgGuaranteeLetterAssignUserServiceImpl.java    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java
index a90aebaa..67230499 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java
@@ -374,6 +374,20 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     paymentConfirmationConsiderCWB.setAuditOpinion("");
                     insert = paymentConfirmationConsiderMapper.updateById(paymentConfirmationConsiderCWB);
                 }
+
+                //法规部数据存在，更新法规部经理财务回款数据
+                QueryWrapper<DgPaymentConfirmationConsider> paymentConfirmationConsiderFG = new QueryWrapper<>();
+                paymentConfirmationConsiderFG.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID);
+                DgPaymentConfirmationConsider paymentConfirmationConsiderFg = paymentConfirmationConsiderMapper.selectOne(paymentConfirmationConsiderFG);
+                //数据存在，进行更新
+                if (ObjectUtil.isNotNull(paymentConfirmationConsiderFg)){
+                    paymentConfirmationConsiderFg.setStatus(StatusCode.SP_IN_REVIEW);
+                    paymentConfirmationConsiderFg.setOperatingStatus(StatusCode.CZ_PROCESSED);
+                    //清空上次的审批意见及银行回单
+                    paymentConfirmationConsiderFg.setAuditOpinion("");
+                    paymentConfirmationConsiderFg.setImgFile("");
+                    paymentConfirmationConsiderMapper.updateById(paymentConfirmationConsiderFg);
+                }
                 //更新成功，返回操作结果
                 log.info(insert > 0 ? "资产部经理成功添加回款数据" : "资产部经理添加回款数据失败");
                 return insert > 0;