bug 1.0

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

@@ -103,22 +103,22 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
                     " SELECT task.task_name,task.type,info.customer_no,info.user_no ,task.task_start_time,task.task_end_time,info.staff_no,a.c,info.check_state  from \n" +
                     "(SELECT data_id,count(*) c from sms_lot_customer_data_log_bill group by data_id ) a \n" +
                     "LEFT JOIN  sms_check_customer_info  info  on info.data_id =a.data_id \n" +
-                    "LEFT JOIN  sms_check_task task  on  task.id=info.task_id where info.del_flag is not null \n" +
+                    "LEFT JOIN  sms_check_task task  on  task.id=info.task_id where info.del_flag =0 \n" +
                     "UNION all \n" +
                     " SELECT task.task_name,task.type,info.customer_no,info.user_no ,task.task_start_time,task.task_end_time,info.staff_no,a.c,info.check_state  from \n" +
                     "(SELECT data_id,count(*) c from sms_truck_customer_data_log_bill group by data_id ) a \n" +
                     "LEFT JOIN  sms_check_customer_info  info  on info.data_id =a.data_id \n" +
-                    "LEFT JOIN  sms_check_task task  on  task.id=info.task_id where info.del_flag is not null  \n" +
+                    "LEFT JOIN  sms_check_task task  on  task.id=info.task_id where info.del_flag =0  \n" +
                     "UNION all \n" +
                     "SELECT task.task_name,task.type,info.customer_no,info.user_no ,task.task_start_time,task.task_end_time,info.staff_no,a.c,info.check_state  from \n" +
                     "(SELECT data_id,count(*) c from sms_check_customer_data_log_bill group by data_id ) a \n" +
                     "LEFT JOIN  sms_check_customer_info  info  on info.data_id =a.data_id \n" +
-                    "LEFT JOIN  sms_check_task task  on  task.id=info.task_id where info.del_flag is not null  \n" +
+                    "LEFT JOIN  sms_check_task task  on  task.id=info.task_id where info.del_flag =0  \n" +
                     "UNION all \n" +
                     "SELECT task.task_name,task.type,info.customer_no,info.user_no ,task.task_start_time,task.task_end_time,info.staff_no,a.c,info.check_state  from \n" +
                     "(SELECT data_id,count(*) c from sms_check_customer_data_log_bill group by data_id ) a \n" +
                     "LEFT JOIN  sms_check_customer_info  info  on info.data_id =a.data_id \n" +
-                    "LEFT JOIN  sms_check_task task  on  task.id=info.task_id where info.del_flag is not null   ) aa  where 1=1  ");
+                    "LEFT JOIN  sms_check_task task  on  task.id=info.task_id where info.del_flag =0   ) aa  where 1=1  ");
                     if (StringUtils.isNotBlank(parameterMap.get("customerNo"))){
                         sql.append(" and customer_no like '%"+parameterMap.get("customerNo").replace("*","")+"%' ");
                     }

tnc-system/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java

@@ -186,7 +186,7 @@ public class SysRoleController {
 						String replace = sysRolePermission.getDataRuleIds()
 								.replace(sysPermission1, join)
 								.replace(sysPermission2, join)
-								.replace(sysPermission2, join);
+								.replace(sysPermission3, join).replace(sysPermission4, join);
 						UpdateWrapper<SysRolePermission> updateWrapper = new UpdateWrapper<>();
 						updateWrapper
 								.eq("role_id",role.getId())