2

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

@@ -6,6 +6,7 @@ import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.apache.ibatis.annotations.UpdateProvider;
 import org.jeecg.common.system.vo.SysDepartModel;
+import org.jeecg.common.system.vo.SysPermissionDataRuleModel;
 import org.jeecg.modules.smscheck.entity.*;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
 import org.jeecg.modules.smscheck.vo.SmsCheckTaskVo;
@@ -49,11 +50,12 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
     List<SmsCustomerInfoGroupByCheckState> groupCheckState(String startDate, String endDate,String taskId,String taskType);
 
     @SelectProvider(type = ProviderClass.class, method = "selectListPage")
-    List<SmsCheckCustomerInfoBecomeDueAndInfo> selectListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo);
+    List<SmsCheckCustomerInfoBecomeDueAndInfo> selectListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo, SysPermissionDataRuleModel sysPermissionDataRuleModel, SysUser sysUser );
 
     class ProviderClass {
 
-        public String selectListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo){
+        public String selectListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo,SysPermissionDataRuleModel sysPermissionDataRuleModel,  SysUser sysUser ){
+
 
             StringBuilder sql = new StringBuilder();
 
@@ -120,9 +122,7 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
                     "sms_check_customer_info.`account_code`,\n" +
                     "sms_check_customer_info.`floor_name`,\n" +
                     "sms_check_customer_info.`floor_code`,\n" +
-                    "sms_check_customer_info_become_due.`create_time`,\n" +
-                    "sms_check_customer_info.`notes`   " +
-                    "from sms_check_customer_info_become_due   \n" +
+                    "sms_check_customer_info.`notes`   from sms_check_customer_info_become_due   \n" +
                     "LEFT JOIN sms_check_customer_info   on sms_check_customer_info_become_due.info_id = sms_check_customer_info.id \n" +
                     " where 1=1 and  sms_check_customer_info_become_due.del_flag=0    ");
             if (StringUtils.isNotBlank(smsCheckCustomerInfo.getCustomerNo())){
@@ -142,13 +142,13 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
             }
             if (sysPermissionDataRuleModel!=null && StringUtils.isNotBlank(sysPermissionDataRuleModel.getRuleName())){
                 if (sysPermissionDataRuleModel.getRuleName().equals("sysPowerOrg")){
-                    sql.append(" and  sms_check_customer_info_become_due.sys_org_code like  '"+sysUser.getOrgCode() +"%'");
+                    sql.append("sms_check_customer_info_become_due.sys_org_code like  '"+sysUser.getOrgCode() +"%'");
                 }
                 if (sysPermissionDataRuleModel.getRuleName().equals("sysPowerCreateBy")){
-                    sql.append(" and sms_check_customer_info_become_due.staff_no like  '"+sysUser.getUsername() +"'");
+                    sql.append("sms_check_customer_info_become_due.staff_no like  '"+sysUser.getUsername() +"'");
                 }
                 if (sysPermissionDataRuleModel.getRuleName().equals("sysPowerThisOrg")){
-                    sql.append(" and  sms_check_customer_info_become_due.sys_org_code like  '"+sysUser.getOrgCode() +"'");
+                    sql.append("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);