双规+小程序问题修正

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/service/impl/TzsAppService.java

@@ -13,7 +13,6 @@ import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.app.api.common.CommonException;
 import com.yeejoin.amos.boot.module.app.api.common.MobileLoginParam;
 import com.yeejoin.amos.boot.module.app.api.dto.*;
 import com.yeejoin.amos.boot.module.app.api.entity.*;
@@ -611,7 +610,7 @@ public class TzsAppService {
             if (StringUtils.isEmpty(message)) {
                 message = "账号或密码错误";
             }
-            throw new CommonException(600001, message);
+            throw new BadRequest(message);
         }
         if (ValidationUtil.isEmpty(idpassword) || ValidationUtil.isEmpty(idpassword.getResult()) ||
                 ValidationUtil.isEmpty(idpassword.getResult().get("userId"))) {

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -1140,7 +1140,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 
         for (Map<String, String> excludeItem : excludeItems) {
             List<AppCheckInputRespone> appCheckInputRespones = collect2.get(String.valueOf(excludeItem.get("point_id")));
-            if (excludeItem.containsKey("exclude_items") && !ObjectUtils.isEmpty(excludeItem.get("exclude_items"))) {
+            if (excludeItem.containsKey("exclude_items") && !ObjectUtils.isEmpty(excludeItem.get("exclude_items")) && appCheckInputRespones != null) {
                 String[] exclude_items = excludeItem.get("exclude_items").split(",");
                 List<AppCheckInputRespone> appCheckInputRespones1 = new ArrayList<>();
                 for (String exclude_item : exclude_items) {