Merge remote-tracking branch 'origin/master'

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;

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">