1111

src/main/java/com/yunzhi/marketing/controller/ExtendContentController.java

@@ -186,6 +186,7 @@ public class ExtendContentController extends BaseController {
             extendContent.setContentType("nothing");
         }
         extendContent.setCreateUser(getUserId(request));
+        extendContent.setInstitutionId(getInstitutionId(request));
         responseBean = iExtendContentService.extendContentAdd(extendContent);
         responseBean.addSuccess(extendContent);
         return responseBean;

src/main/java/com/yunzhi/marketing/controller/TaChannelController.java

@@ -134,6 +134,7 @@ public class TaChannelController extends BaseController {
             int channelCode= taChannelMapper.channelCode();
             channel.setChannelCode(String.valueOf(channelCode));
             channel.setOrgId(orgId);
+            channel.setInstitutionId(getInstitutionId(request));
             if (taChannelService.save(channel)){
                 responseBean.addSuccess(channel);
             }else {

src/main/java/com/yunzhi/marketing/entity/ExtendContent.java

@@ -111,4 +111,9 @@ public class ExtendContent implements Serializable {
      */
     @TableField(strategy = FieldStrategy.IGNORED)
     private Integer orderNo;
+
+    /**
+     * 组织机构code
+     */
+    private String institutionId;
 }

src/main/java/com/yunzhi/marketing/xlk/controller/CurriculumController.java

@@ -115,6 +115,7 @@ public class CurriculumController extends BaseController {
             curriculum.setCreatedTime(LocalDateTime.now());
             curriculum.setCreatedBy(getUserId(request));
             curriculum.setOrgId(getOrgId(request));
+            curriculum.setInstitutionId(getInstitutionId(request));
             if (iCurriculumService.save(curriculum)){
                 responseBean.addSuccess(curriculum);
             }else {

src/main/java/com/yunzhi/marketing/xlk/entity/Curriculum.java

@@ -118,4 +118,9 @@ public class Curriculum implements java.io.Serializable {
      */
     @TableField(exist = false)
     private Boolean isSaved;
+
+    /**
+     * 组织机构code
+     */
+    private String institutionId;
 }

src/main/resources/mapper/xlk/PcStatisticsMapper.xml

@@ -41,7 +41,7 @@
         FROM
         ta_person tp
         where tp.org_id = #{params.orgId}
-        and tp.person_type = 'estate agent'
+        and tp.person_type in ('estate agent','channel agent')
     </select>
     <select id="getUserOriginStatistics" resultType="com.yunzhi.marketing.xlk.vo.PcStatisticsVO">
         SELECT