Pārlūkot izejas kodu

fix: 知会分页-NPE异常

lixuesong 3 mēneši atpakaļ
vecāks
revīzija
3481d7aba2

+ 9 - 5
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmPackageManager.java

@@ -157,11 +157,15 @@ public class WmPackageManager {
 
     Page<WmPackageRedemptionNotice> page = new Page<>(query.getCurrent(), query.getSize());
     LambdaQueryWrapper<WmPackageRedemptionNotice> queryWrapper = Wrappers.lambdaQuery();
-    queryWrapper.eq(query.getCheckState() != null, WmPackageRedemptionNotice::getCheckState,
-        query.getCheckState().getState());
-    queryWrapper.eq(query.getNoticeState() != null, WmPackageRedemptionNotice::getNoticeState,
-        query.getNoticeState().getState());
-    queryWrapper.eq(query.getStep() != null, WmPackageRedemptionNotice::getStep, query.getStep());
+    if (query.getCheckState() != null) {
+      queryWrapper.eq(WmPackageRedemptionNotice::getCheckState, query.getCheckState().getState());
+    }
+    if (query.getNoticeState() != null) {
+      queryWrapper.eq(WmPackageRedemptionNotice::getNoticeState, query.getNoticeState().getState());
+    }
+    if (query.getStep() != null) {
+      queryWrapper.eq(WmPackageRedemptionNotice::getStep, query.getStep());
+    }
 
     // 根据用户角色判断是管理员还是服务商
     // 区域管理员