渠道多用户所属

netflix-dao/src/main/java/com/cyksj/model/entity/Channel.java

@@ -1,5 +1,6 @@
 package com.cyksj.model.entity;
 
+import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,6 +10,8 @@ import lombok.Setter;
  */
 @Getter
 @Setter
+@SearchBean(tables = "channel c",
+		where = ":condition:")
 public class Channel extends BaseEntity{
 
     /**
@@ -39,5 +42,5 @@ public class Channel extends BaseEntity{
     /**
      * 创建人
      */
-    private Long creator;
+    private String creator;
 }

netflix-dao/src/main/java/com/cyksj/model/views/ChannelPopularizeView.java

@@ -17,6 +17,7 @@ import java.util.Date;
 @Setter
 @SearchBean(tables = "channel_popularize cp " +
         " LEFT JOIN channel c on c.id = cp.channel_id "
+        ,where = ":condition:"
         ,groupBy = "cp.id,cp.name,cp.url,cp.modality,cp.pay_method,cp.created_time,cp.update_time"
 )
 public class ChannelPopularizeView {
@@ -37,7 +38,7 @@ public class ChannelPopularizeView {
     private String channelName;
 
     @DbField("c.creator")
-    private Long creator;
+    private String creator;
 
     /**
      * 链接名称

netflix-dao/src/main/java/com/cyksj/model/views/ChannelView.java

@@ -19,7 +19,8 @@ import java.util.Date;
         " LEFT JOIN order_don o on cp.id = o.popularize_id :time: " +
         " LEFT JOIN order_don o1 on o.id = o1.id and o1.`status` not in ('close','noPayment') " +
         " LEFT JOIN order_don o2 on o.id = o2.id and o2.`status` = 'refund' "
-        ,groupBy = " c.id,c.`name`,c.wx_shop_id,c.host,c.zfb_shop_id,c.created_time,c.update_time"
+        , where = ":condition:"
+        , groupBy = " c.id,c.`name`,c.wx_shop_id,c.host,c.zfb_shop_id,c.created_time,c.update_time"
         ,distinct = true
 )
 public class ChannelView {
@@ -82,7 +83,7 @@ public class ChannelView {
     private String remark;
 
     @DbField("c.creator")
-    private Long creator;
+    private String creator;
 
 
     @DbField("c.created_time")

netflix-web/src/main/java/com/cyksj/web/controller/manage/channel/CmsChannelController.java

@@ -55,7 +55,7 @@ public class CmsChannelController {
         }
         MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
         if (!isRootRole) {
-            builder.field(ChannelView::getCreator, adminId);
+            builder.put("condition", String.format("FIND_IN_SET(%s,c.creator) > 0", adminId));
         }
         SearchResult<ChannelView> searchResult = beanSearcher.search(ChannelView.class,
                 builder.put("time", timeSql).build());
@@ -71,7 +71,7 @@ public class CmsChannelController {
         long adminId = StpUtil.getLoginIdAsLong();
         Boolean isRootRole = cmsUserService.isRootRole(adminId);
         if (!isRootRole) {
-            builder.field(Channel::getCreator, adminId);
+            builder.put("condition", String.format("FIND_IN_SET(%s,c.creator) > 0", adminId));
         }
         List<Channel> list = beanSearcher.searchAll(Channel.class, builder
                 .onlySelect(Channel::getId, Channel::getName)
@@ -81,8 +81,8 @@ public class CmsChannelController {
 
     @PostMapping
     public Result<String> post(@RequestBody Channel channel){
-        long adminId = StpUtil.getLoginIdAsLong();
-        channel.setCreator(adminId);
+        Long adminId = StpUtil.getLoginIdAsLong();
+        channel.setCreator(adminId.toString());
         channelService.save(channel);
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }

netflix-web/src/main/java/com/cyksj/web/controller/manage/channel/CmsChannelPopularizeController.java

@@ -61,7 +61,7 @@ public class CmsChannelPopularizeController {
         MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
         Boolean isRootRole = cmsUserService.isRootRole(adminId);
         if (!isRootRole) {
-            builder.field(ChannelPopularizeView::getCreator, adminId);
+            builder.put("condition", String.format("FIND_IN_SET(%s,c.creator) > 0", adminId));
         }
         SearchResult<ChannelPopularizeView> searchResult = beanSearcher.search(ChannelPopularizeView.class, builder.build());
         searchResult.getDataList().forEach(data -> {