Merge branch 'feature/xgh/20250609' into 'master'

非空判断

See merge request !2967

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/moment/QwMomentController.java

@@ -74,6 +74,9 @@ public class QwMomentController {
         logger.info("查询活动列表={}", JSONObject.toJSONString(qo));
         PlanListWxaQDTO qdto = EntityUtil.changeEntityByJSON(PlanListWxaQDTO.class,qo) ;
         ClerkDTO clerk  = this.clerkService.getclerkById(qo.getClerkId()) ;
+        if(null == clerk) {
+            return RestResponse.failure("9999","导购不存在或已删除") ;
+        }
         if(0 != clerk.getClerkType()) {
             qdto.setClerkId(null);
         }