Merge remote-tracking branch 'origin/master'

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SpecialExaminationContrller.java

@@ -206,7 +206,7 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
             EmailSendMsgHandle emailSendMsgHandle = new EmailSendMsgHandle();
             emailSendMsgHandle.SendMsg("liutt3.bj@chinatelecom.cn",
                     customerInfo.getCreateBy() + "提交复开申请",
-                    "工号：" + customerInfo.getStaffNo() + " 工单创建人：" + customerInfo.getCreateBy() + " 提交了复开号码为" + customerInfo.getCustomerNo() + "的复开申请，请及时进行稽核。"
+                    "工号：" + customerInfo.getStaffNo() + " 工单创建人：" + customerInfo.getCreateBy() + " 提交了复开号码为" + customerInfo.getSmsNumber() + "的复开申请，请及时进行稽核。"
             );
         }
         return Result.OK("已成功提交申请");

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SmsCheckCustomerInfoMapper.java

@@ -202,7 +202,9 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
         }
         public String selectCompanyList(SmsCheckCustomerInfo smsCheckCustomerInfo) {
             StringBuilder sql = new StringBuilder();
-            sql.append("SELECT any_value(id) id, any_value(customer_no) customer_no,`customer_name`,any_value(account_manager) account_manager,any_value(account_manager_phone) account_manager_phone,any_value(network_access_time) network_access_time  FROM `sms_check_customer_info`");
+            sql.append("SELECT any_value(id) id, any_value(customer_no) customer_no,`customer_name`,any_value(sms_number) sms_number,any_value(network_access_time) network_access_time  " +
+                    "FROM `sms_check_customer_info` " +
+                    "WHERE customer_name is not NULL");
             String customerNo = smsCheckCustomerInfo.getCustomerNo();
             String customerName = smsCheckCustomerInfo.getCustomerName();
             if (!StringUtils.isEmpty(customerNo)) {