liuhy 2 лет назад
Родитель
Сommit
251bad96b5

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

@@ -59,7 +59,7 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
 
             StringBuilder sql = new StringBuilder();
 
-            sql.append("sELECT     sms_check_customer_info_become_due.`id`  ,\n" +
+            sql.append("SELECT     sms_check_customer_info_become_due.`id`  ,\n" +
                     "sms_check_customer_info_become_due.`task_id`,\n" +
                     "sms_check_customer_info_become_due.`info_id`,\n" +
                     "sms_check_customer_info_become_due.`check_state` as warning_state ,\n" +
@@ -72,6 +72,7 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
                     "sms_check_customer_info_become_due.`truck_contract_date_is`,\n" +
                     "sms_check_customer_info_become_due.`truck_house_date_is`,\n" +
                     "sms_check_customer_info_become_due.`truck_added_license_date_is`,\n" +
+                    "sms_check_customer_info_become_due.`create_time`,\n" +
                     "sms_check_customer_info.`customer_no`,\n" +
                     "sms_check_customer_info.`customer_name`,\n" +
                     "sms_check_customer_info.`sms_number`,\n" +
@@ -142,16 +143,16 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
             }
             if (sysPermissionDataRuleModel!=null && StringUtils.isNotBlank(sysPermissionDataRuleModel.getRuleName())){
                 if (sysPermissionDataRuleModel.getRuleName().equals("sysPowerOrg")){
-                    sql.append("sms_check_customer_info_become_due.sys_org_code like  '"+sysUser.getOrgCode() +"%'");
+                    sql.append("and sms_check_customer_info_become_due.sys_org_code like  '"+sysUser.getOrgCode() +"%'");
                 }
                 if (sysPermissionDataRuleModel.getRuleName().equals("sysPowerCreateBy")){
-                    sql.append("sms_check_customer_info_become_due.staff_no like  '"+sysUser.getUsername() +"'");
+                    sql.append("and sms_check_customer_info_become_due.staff_no like  '"+sysUser.getUsername() +"'");
                 }
                 if (sysPermissionDataRuleModel.getRuleName().equals("sysPowerThisOrg")){
-                    sql.append("sms_check_customer_info_become_due.sys_org_code like  '"+sysUser.getOrgCode() +"'");
+                    sql.append("and sms_check_customer_info_become_due.sys_org_code like  '"+sysUser.getOrgCode() +"'");
                 }
             }
-            sql.append(" ORDER BY sms_check_customer_info_become_due.create_time  LIMIT " + (pageNo - 1) * pageSize + "," + pageSize);
+            sql.append(" ORDER BY sms_check_customer_info_become_due.create_time DESC  LIMIT " + (pageNo - 1) * pageSize + "," + pageSize);
             return sql.toString();
         }