bug

src/main/java/com/huiju/estateagents/controller/HelpActivityController.java

@@ -379,15 +379,11 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "helpActivityId", paramType = "path", value = "活动状态")
     })
     @RequestMapping(value = "/wx/helpActivity/{helpActivityId}", method = RequestMethod.GET)
-    public ResponseBean wxHelpActivityGet(@PathVariable(value = "helpActivityId") Integer helpActivityId,HttpServletRequest request) {
+    public ResponseBean wxHelpActivityGet(@PathVariable(value = "helpActivityId") Integer helpActivityId,
+                                          @RequestParam(value = "initiateId",required = false) Integer initiateId,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
-        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
-        if (null == taPersons || taPersons.size() != 1) {
-            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-        TaPerson person = taPersons.get(0);
+        
         Map<String,Object> map = new HashMap<>();
         try {
             //活动信息
@@ -395,25 +391,23 @@ public class HelpActivityController extends BaseController {
             map.put("helpActivity",helpActivity);
             
             //发起者信息
-            QueryWrapper<HelpInitiateRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
-            queryWrapper.eq("persion_id",person.getPersonId());
-            queryWrapper.eq("org_id",orgId);
-            HelpInitiateRecord helpInitiateRecord = helpInitiateRecordService.getOne(queryWrapper);
-            if (null != helpInitiateRecord){
-                helpActivity.setHelpStatus(CommConstant.HELP_STATUS_INITIATE);
+             if (null != initiateId){
+                 HelpInitiateRecord helpInitiateRecord = helpInitiateRecordService.getById(initiateId);
+                 if (null != helpInitiateRecord){
+                     helpActivity.setHelpStatus(CommConstant.HELP_STATUS_INITIATE);
+        
+                     //助力者信息
+                     QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
+                     helpRecordQueryWrapper.eq("org_id",orgId);
+                     helpRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
+                     helpRecordQueryWrapper.eq("help_record_initiate_id",helpInitiateRecord.getHelpRecordInitiateId());
+                     List<HelpRecord> helpRecordList = helpRecordService.list(helpRecordQueryWrapper);
+        
+                     map.put("helpInitiateRecord",helpInitiateRecord);
+                     map.put("helpRecordList",helpRecordList);
+                 }
+             }
     
-                //助力者信息
-                QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
-                helpRecordQueryWrapper.eq("org_id",orgId);
-                helpRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
-                helpRecordQueryWrapper.eq("help_record_initiate_id",helpInitiateRecord.getHelpRecordInitiateId());
-                List<HelpRecord> helpRecordList = helpRecordService.list(helpRecordQueryWrapper);
-                
-                map.put("helpInitiateRecord",helpInitiateRecord);
-                map.put("helpRecordList",helpRecordList);
-            }
-            
             //获取海报信息
             QueryWrapper<TaPoster> posterQueryWrapper = new QueryWrapper<>();
             posterQueryWrapper.eq("target_type",CommConstant.HELP_ACTIVITY);