正式环境正常的用户才会收到短信

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/component/TimingRemindImpl.java

@@ -107,7 +107,8 @@ public class TimingRemindImpl implements TimingRemindService {
         //添加用户进表的时候手机号已经经过处理
         SysUser user = new SysUser();
         user.setUserType("02");
-        sysUserMapper.selectUserList(user).forEach(x -> {
+        for (SysUser x : sysUserMapper.selectUserList(user)) {
+            if("0".equals(x.getDelFlag()) & "0".equals(x.getStatus())){
                 JSmartDeclaration sd = new JSmartDeclaration();
                 sd.setIsRead(1);
                 sd.setAlertTime(LocalDateTime.parse(t));
@@ -127,7 +128,8 @@ public class TimingRemindImpl implements TimingRemindService {
                     }
                 }
                 listAdd.add(sd);
-        });
+            }
+        }
         jSmartDeclarationService.saveBatch(listAdd);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/SmsEnterChange.java

@@ -47,9 +47,11 @@ public class SmsEnterChange {
                 List<SysUser> list1 = sysUserMapper.selectUserList(user);
                 list1.removeIf(x -> x.getPhonenumber().isEmpty());
                 for (SysUser items : list1) {
+                    if("0".equals(items.getDelFlag()) & "0".equals(items.getStatus())) {
                         smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count + "个新的申报审核任务[待初审]", items.getPhonenumber());
                     }
                 }
+            }
             //查询复审的所有用户
             SysUser user1 = new SysUser();
             user1.setDeptId(101L);
@@ -58,9 +60,11 @@ public class SmsEnterChange {
                 List<SysUser> list2 = sysUserMapper.selectUserList(user1);
                 list2.removeIf(x -> x.getPhonenumber().isEmpty());
                 for (SysUser items : list2) {
+                    if("0".equals(items.getDelFlag()) & "0".equals(items.getStatus())) {
                         smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count1 + "个新的申报审核任务[待复审]", items.getPhonenumber());
                     }
                 }
+            }
             //查询终审的所有用户
             SysUser user2 = new SysUser();
             user2.setDeptId(103L);
@@ -69,9 +73,11 @@ public class SmsEnterChange {
                 List<SysUser> list3 = sysUserMapper.selectUserList(user2);
                 list3.removeIf(x -> x.getPhonenumber().isEmpty());
                 for (SysUser items : list3) {
+                    if("0".equals(items.getDelFlag()) & "0".equals(items.getStatus())) {
                         smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count2 + "个新的申报审核任务[待终审]", items.getPhonenumber());
                     }
                 }
             }
         }
     }
+}

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java

@@ -281,7 +281,8 @@ public class TimeChange {
         jp.forEach(x -> {
             SysUser user = new SysUser();
             user.setUserType("02");
-            sysUserMapper.selectUserList(user).forEach(o -> {
+            for (SysUser o : sysUserMapper.selectUserList(user)) {
+                if("0".equals(o.getDelFlag()) & "0".equals(o.getStatus())) {
                     JSmartDeclaration y = new JSmartDeclaration();
                     y.setSmartRemindersId(2L);
                     y.setIsRead(1);
@@ -292,7 +293,8 @@ public class TimeChange {
                     if (isTiming) {
                         smsAlertsService.enterSms("政府人员-" + o.getNickName(), "您有1个项目即将建设完成,请前往工作台查看。", o.getPhonenumber());
                     }
-            });
+                }
+            }
         });
         jSmartDeclarationService.saveBatch(bmsDeclarationRecords);
     }

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java

@@ -66,7 +66,6 @@ public class JEnterpriseContactController extends BaseController {
         } catch (Exception ignored) {
         }
         if (!admin && b) {
-            jEnterpriseContactRequest.setEnterpriseName(str.getNickName());
             jEnterpriseContactRequest.setEnterpriseCode(str.getUserName());
         }
         if (page.getCurrent() >= 1 & page.getSize() >= 1) {