bug fix

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

@@ -87,8 +87,9 @@ public class ExtendContentController extends BaseController {
                                                   @RequestParam(value = "contentType", required = false) String contentType,
                                                   @RequestParam(value = "buildingId", required = false) String buildingId,
                                                   @RequestParam(value = "contentId", required = false) String contentId,
-                                                  @RequestParam(value = "cityId", required = false) Integer cityId){
-        ResponseBean responseBean= iExtendContentService.selectExtendContentListShowType(showType, showPosition, targetId,contentType, buildingId, contentId, cityId);
+                                                  @RequestParam(value = "cityId", required = false) Integer cityId,
+                                                  HttpServletRequest request){
+        ResponseBean responseBean= iExtendContentService.selectExtendContentListShowType(showType, showPosition, targetId,contentType, buildingId, contentId, cityId,getOrgId(request));
         return responseBean;
     }
 

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

@@ -78,6 +78,7 @@ public class MiniAppController extends BaseController {
             String code,
             @RequestParam(required = false) String from,
             @RequestParam(required = false)String recommender,
+            @RequestParam(required = false)String targetId,
             HttpServletRequest request) {
         String appid = request.getHeader("appid");
 

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

@@ -24,6 +24,10 @@ import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import com.huiju.estateagents.service.TaChannelPersonService;
 import com.huiju.estateagents.service.TaChannelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.*;
@@ -48,6 +52,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "项目类型", tags = "项目类型")
 public class TaRecommendCustomerController extends BaseController {
 
     @Autowired
@@ -74,6 +79,12 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @GetMapping("/wx/customer/list")
+    @ApiOperation(value = "查询我的客户列表", notes = "查询我的客户列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNumber", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "keywords", paramType = "query",value = "搜索关键字，目前仅支持姓名")
+    })
     public ResponseBean getMyCustList(@RequestParam int pageNumber, @RequestParam int pageSize, String keywords, HttpServletRequest request) {
         if (pageNumber < 0 || pageSize < 0) {
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -89,6 +100,10 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @GetMapping("/wx/customer/{id}")
+    @ApiOperation(value = "查询客户详情", notes = "查询客户详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, name = "id", paramType = "path",value = "搜索关键字，目前仅支持姓名")
+    })
     public ResponseBean getCustDetail(@PathVariable String id) {
         if (null == id || "".equals(id.trim())) {
             return ResponseBean.error("请求地址错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -103,6 +118,10 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @PostMapping("/wx/customer/edit")
+    @ApiOperation(value = "客户编辑", notes = "客户编辑")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, name = "id", paramType = "path",value = "搜索关键字，目前仅支持姓名")
+    })
     public ResponseBean updateCust(@RequestBody String paramStr) {
         return taRecommendCustomerService.updateCustByJSON(paramStr);
     }
@@ -478,6 +497,9 @@ public class TaRecommendCustomerController extends BaseController {
                 taRecommendCustomer.setVerifyStatus(verifyStatus);
                 if(!StringUtils.isEmpty(verifyRemark)){
                     taRecommendCustomer.setVerifyRemark(verifyRemark);
+                    if(CommConstant.CUSTOMER_REPORT.equals(taRecommendCustomer.getReportRecommendStatus())){
+                        taRecommendCustomer.setRealtyConsultant(taRecommendCustomer.getRecommendPerson());
+                    }
                 }
                 if (taRecommendCustomerService.updateById(taRecommendCustomer)){
 

src/main/java/com/huiju/estateagents/entity/TaActivityDynamicEnlist.java

@@ -52,4 +52,8 @@ public class TaActivityDynamicEnlist implements Serializable {
 
     private Integer orgId;
 
+    private String sharePerson;
+
+    private String sharePersonType;
+
 }

src/main/java/com/huiju/estateagents/service/IExtendContentService.java

@@ -37,5 +37,5 @@ public interface IExtendContentService extends IService<ExtendContent> {
      * @param cityId
      * @return
      */
-    ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId, Integer cityId);
+    ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId, Integer cityId,Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/impl/ExtendContentServiceImpl.java

@@ -59,7 +59,7 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
     }
 
     @Override
-    public ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId, Integer cityId) {
+    public ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId, Integer cityId,Integer orgId) {
         ResponseBean responseBean= new ResponseBean<>();
         // 开屏
         QueryWrapper<ExtendContent> extendContentQuery= new QueryWrapper<>();
@@ -73,6 +73,7 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
         extendContentQuery.eq(StringUtils.isNotBlank(buildingId), "building_id",buildingId);
         extendContentQuery.eq(null != cityId && cityId != 0, "city_id", cityId);
         extendContentQuery.eq("status","1");
+        extendContentQuery.eq("org_id",orgId);
         List<ExtendContent> taExtendContent = extendContentMapper.selectList(extendContentQuery);
         responseBean.addSuccess(taExtendContent);
         return responseBean;