Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

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

@@ -270,10 +270,10 @@ public class TaShareActivityController extends BaseController {
     
     /**
      * 微信端根据id查询详情
-     * @param groupActicityId  实体ID
+     * @param groupActivityId  实体ID
      */
-    @RequestMapping(value="/wx/taShareActivity/{groupActicityId}",method= RequestMethod.GET)
-    public ResponseBean wxShareActivityGet(@PathVariable Integer groupActicityId,
+    @RequestMapping(value="/wx/taShareActivity/{groupActivityId}",method= RequestMethod.GET)
+    public ResponseBean wxShareActivityGet(@PathVariable Integer groupActivityId,
                                            @RequestParam(value = "recordId",required = false) Integer recordId, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
@@ -286,7 +286,7 @@ public class TaShareActivityController extends BaseController {
         Map<String,Object> map = new HashMap<>();
         try {
             //活动详情
-            TaShareActivity taShareActivity = iTaShareActivityService.getById(groupActicityId);
+            TaShareActivity taShareActivity = iTaShareActivityService.getById(groupActivityId);
             //查看此活动已经完成的数量
             QueryWrapper<TaShareRecord> shareRecordQueryWrapper = new QueryWrapper<>();
             shareRecordQueryWrapper.eq("org_id",orgId);
@@ -324,7 +324,7 @@ public class TaShareActivityController extends BaseController {
             //获取海报信息
             QueryWrapper<TaPoster> posterQueryWrapper = new QueryWrapper<>();
             posterQueryWrapper.eq("target_type",CommConstant.GROUP_ACTIVITY);
-            posterQueryWrapper.eq("target_id",groupActicityId);
+            posterQueryWrapper.eq("target_id",groupActivityId);
             posterQueryWrapper.eq("org_id",orgId);
             List<TaPoster> postList = taPosterService.list(posterQueryWrapper);
             map.put("postList",postList);
@@ -339,7 +339,7 @@ public class TaShareActivityController extends BaseController {
             //获取分享信息
             QueryWrapper<TaShareContent> taShareContentQueryWrapper = new QueryWrapper<>();
             taShareContentQueryWrapper.eq("share_content_type",CommConstant.GROUP_ACTIVITY);
-            taShareContentQueryWrapper.eq("target_id",groupActicityId);
+            taShareContentQueryWrapper.eq("target_id",groupActivityId);
             taShareContentQueryWrapper.eq("org_id",orgId);
             List<TaShareContent> shareContentList = taShareContentService.list(taShareContentQueryWrapper);
             map.put("shareContentList",shareContentList);

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

@@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -149,11 +150,12 @@ public class TdPosterTemplateController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/posterTemplate",method= RequestMethod.GET)
-    public ResponseBean posterTemplateList(@RequestParam(value ="type") String type){
+    public ResponseBean posterTemplateList(@RequestParam(value ="type") String type, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             QueryWrapper<TdPosterTemplate> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("type",type);
+            queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.orderByDesc("create_date");
             
             List<TdPosterTemplate> result = iTdPosterTemplateService.list(queryWrapper);