fix 待办流程提醒

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

@@ -1261,7 +1261,6 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 waitRemindManager.setRemindTitle("有一条【" + loanApplication.getEnterpriseName() + "】的审核信息进入到下一阶段");
                 waitRemindManager.setRemindTime(DateUtils.getNowDate());
                 waitRemindManager.setRemindType(application.getAuditSchedule());
-                waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
                 waitRemindManager.setRemindContent(loanApplication.getEnterpriseName() + "的审核信息申请通过进入到下一阶段");
                 //给管理员发送待办提醒
                 waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
@@ -1404,6 +1403,8 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             waitRemindList.add(waitRemind);
             userIdList.add(loanApplicationOld.getfUserId());
         } else {
+            //查询审核管理员用户id
+            List<SysUserRole> sysUserRoles = sysUserRoleMapper.selectRoleListNoDataScope();
             waitRemind.setRemindType(loanApplication.getAuditSchedule());
             //给A角色发送待办提醒
             waitRemind.setReadUserId(loanApplicationOld.getaUserId().toString());
@@ -1421,17 +1422,36 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 waitRemindList.add(waitRemindf);
                 userIdList.add(loanApplicationOld.getfUserId());
             }
+
+            if (sysUserRoles != null && sysUserRoles.size() > 0) {
+                //极光推送
+                userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
+                for (SysUserRole sysUserRole : sysUserRoles) {
+                    WaitRemind waitRemindManager = new WaitRemind();
+                    waitRemindManager.setLoanApplicationId(loanApplication.getLoanApplicationId());
+                    waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+                    waitRemindManager.setRemindTitle("有一条【" + loanApplication.getEnterpriseName() + "】的审核信息待办");
+                    waitRemindManager.setRemindTime(DateUtils.getNowDate());
+                    waitRemindManager.setRemindType(loanApplication.getAuditSchedule());
+                    waitRemindManager.setRemindContent(loanApplication.getEnterpriseName() + "的审核信息申请需及时处理");
+                    //给管理员发送待办提醒
+                    waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
+                    waitRemindList.add(waitRemindManager);
+                }
+            }
+
         }
         loanApplicationMapper.updateLoanApplication2(loanApplication);
 
         //插入待办事项
         waitRemindMapper.batchWaitRemind(waitRemindList);
-        //发极光推送id
+
+        //极光推送
         List<SysUser> sysUsers = sysUserService.selectUserListByIdList(userIdList);
         if (sysUsers != null && sysUsers.size() > 0) {
             String notificationTitle = "消息通知";
-            String msgTitle = "撤销信息";
-            String msgContent = loanApplication.getEnterpriseName() + "的信息进行了撤销";
+            String msgTitle = "审核信息";
+            String msgContent = loanApplication.getEnterpriseName() + "的审核信息申请需及时处理";
             String jPushVO = "";
             List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
             listS.removeAll(Collections.singleton(null));
@@ -1441,7 +1461,6 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             }
         }
 
-
         //业务审核意见插入撤销
         ReviewComments reviewComments = new ReviewComments();
         reviewComments.setLoanApplicationId(loanApplication.getLoanApplicationId());