Merge remote-tracking branch 'origin/master'

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/LoanApplicationServiceImpl.java

@@ -519,11 +519,13 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             waitRemind.setRemindTime(DateUtils.getNowDate());
             waitRemind.setRemindType(TWO);
             if (auditSchedule.equals(ONE)) {
-                //设置AB角色id
+                //设置AB角色id和风险ID
                 loanApplication.setaUserId(reviewComments.getaUserId());
                 loanApplication.setaUserName(reviewComments.getaUserName());
                 loanApplication.setbUserId(reviewComments.getbUserId());
                 loanApplication.setbUserName(reviewComments.getbUserName());
+                loanApplication.setfUserId(reviewComments.getfUserId());
+                loanApplication.setfUserName(reviewComments.getfUserName());
                 //给A角色发送待办提醒
                 waitRemind.setReadUserId(reviewComments.getaUserId().toString());
                 waitRemind.setRemindContent(enterpriseName + "有一条申请贷款信息审核通过");

ruoyi-system/src/main/java/com/ruoyi/system/domain/review/ReviewComments.java

@@ -79,6 +79,30 @@ public class ReviewComments extends BaseEntity
     @Excel(name = "B角色用户名称")
     private String bUserName;
 
+    /** 风险用户id */
+    @Excel(name = "风险用户id")
+    private Long fUserId;
+
+    /** 风险用户名称 */
+    @Excel(name = "风险用户名称")
+    private String fUserName;
+
+    public Long getfUserId() {
+        return fUserId;
+    }
+
+    public void setfUserId(Long fUserId) {
+        this.fUserId = fUserId;
+    }
+
+    public String getfUserName() {
+        return fUserName;
+    }
+
+    public void setfUserName(String fUserName) {
+        this.fUserName = fUserName;
+    }
+
     public Date getReviewTime() {
         return reviewTime;
     }