1.bug修复

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

@@ -158,12 +158,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
                                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                                     HttpServletRequest request) {
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String workNo = sysUser.getWorkNo();
-        if (StringUtils.isEmpty(workNo)) {
-            return Result.error("该用户不存在");
-        }
-        smsCheckCustomerInfo.setStaffNo(workNo);
+        smsCheckCustomerInfo.setDelFlag(0);
         QueryWrapper<SmsCheckCustomerInfo> queryWrapper = QueryGenerator.initQueryWrapper(smsCheckCustomerInfo, request.getParameterMap());
         Page<SmsCheckCustomerInfo> page = new Page<>(pageNo, pageSize);
         queryWrapper.orderByAsc("create_time");
@@ -1429,7 +1424,10 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         Set<String> TaskIdSet = this.selectTaskId(smsCheckCustomerInfo);
         ArrayList<SmsCheckTask> list = new ArrayList<>();
         for (String taskId : TaskIdSet) {
-            list.add(taskService.getById(taskId));
+            SmsCheckTask byId = taskService.getById(taskId);
+            if (byId != null){
+                list.add(taskService.getById(taskId));
+            }
         }
         return Result.ok(new Page<SmsCheckTask>(pageNo, pageSize).setRecords(list));
     }

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

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.base.Joiner;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;