fix(marketing): 修复活动查询时的空指针异常

- 在 commonQueryWrapper 方法中添加了对 mercId 的非空检查- 避免了传入空参数时可能导致的空指针异常

src/main/java/com/xynet/marketing/service/impl/PromotionServiceImpl.java

@@ -41,7 +41,9 @@ public class PromotionServiceImpl extends ServiceImpl<PromotionMapper, Promotion
 
     private LambdaQueryWrapper<Promotion> commonQueryWrapper(JMap<String, Object> param) {
         //先更新状态
-        autoUpdateStatus(param.getInt("mercId"));
+        if (Emptys.check(param.getInt("mercId"))) {
+            autoUpdateStatus(param.getInt("mercId"));
+        }
         LambdaQueryWrapper<Promotion> lqw = new LambdaQueryWrapper<Promotion>()
                 .eq(Emptys.check(param.getInt("id")), Promotion::getId, param.getInt("id"))
                 .eq(Emptys.check(param.getInt("mercId")), Promotion::getMercId, param.getInt("mercId"))