Browse Source

feat:“海外邮件机器上下线推送增加开关"

soobin 9 months ago
parent
commit
000bc85314

+ 1 - 1
src/main/java/com/szwl/controller/IndexController.java

@@ -1456,7 +1456,7 @@ public class IndexController {
                 }
                 // 查询是否国外账号,国外就发送邮件
                 String ifForeign = admin.getIfForeign();
-                if(StringUtils.isNotEmpty(ifForeign) && ifForeign.equals("1")) {
+                if(StringUtils.isNotEmpty(ifForeign) && ifForeign.equals("1") && onOffNotice.equals("1")) {
                     // 发送邮件提醒
                     String machineType = equipment.getMachineType();
                     if (StringUtils.isNotEmpty(machineType)) {

+ 10 - 6
src/main/java/com/szwl/controller/TAdminController.java

@@ -1152,16 +1152,20 @@ public class TAdminController {
         if (StringUtils.isEmpty(adminId) || StringUtils.isEmpty(onOffNotice)) {
             return R.fail(ResponseCodesEnum.A0001);
         }
+        TAdmin admin = tAdminService.getById(adminId);
         // 查询是否有绑定微信
         if (onOffNotice.equals("1")) {
-            LambdaQueryWrapper<TWechat> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(TWechat::getAdminId, adminId);
-            TWechat wechat = wechatService.getOne(wrapper);
-            if (wechat == null) {
-                return R.fail(ResponseCodesEnum.A0001, "请先绑定微信");
+            // 如果是国内用户才需要查询
+            if (StringUtils.isNotEmpty(admin.getIfForeign()) && admin.getIfForeign().equals("0")) {
+                LambdaQueryWrapper<TWechat> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(TWechat::getAdminId, adminId);
+                TWechat wechat = wechatService.getOne(wrapper);
+                if (wechat == null) {
+                    return R.fail(ResponseCodesEnum.A0001, "请先绑定微信");
+                }
             }
         }
-        TAdmin admin = tAdminService.getById(adminId);
+
         admin.setOnOffNotice(onOffNotice);
         tAdminService.updateById(admin);
         return R.ok();