zoujiajian 2 anos atrás
pai
commit
0e8df768ef

+ 21 - 3
netflix-dao/src/main/java/com/cyksj/model/views/SysCorpFollowView.java

@@ -16,9 +16,9 @@ import java.util.List;
  */
 @Getter
 @Setter
-@SearchBean(tables = "sys_corp_follow sf",
-		where = "sf.deleted is true",
-		orderBy = "sf.update_time desc")
+@SearchBean(tables = "sys_corp_follow sf left join sys_corp_follow_relate sfr on sf.id = sfr.mid",
+		where = "sf.deleted is true and sfr.deleted is true",
+		orderBy = "sf.id,sfr.update_time desc")
 public class SysCorpFollowView {
 	@DbField("sf.id")
 	private Long mid;
@@ -26,6 +26,24 @@ public class SysCorpFollowView {
 	@DbField("sf.name")
 	private String name;
 
+	@DbField("sfr.id")
+	private Long sid;
+
+	@DbField("sfr.name")
+	private String followName;
+
+	@DbField("sfr.follow_id")
+	private String followId;
+
+	@DbField("sfr.img")
+	private String img;
+
+	/**
+	 * 激活状态: 1=已激活,2=已禁用,4=未激活,5=退出企业
+	 */
+	@DbField("sfr.status")
+	private Integer status;
+
 	@DbIgnore
 	List<SysCorpFollowRelateView> subList;
 

+ 0 - 3
netflix-web/src/main/java/com/cyksj/web/controller/sys/SysCorpFollowController.java

@@ -69,9 +69,6 @@ public class SysCorpFollowController {
 	@GetMapping("/get")
 	public Result<List<SysCorpFollowView>> get() {
 		List<SysCorpFollowView> sysCorpFollowViews = beanSearcher.searchAll(SysCorpFollowView.class, MapUtils.builder().build());
-		sysCorpFollowViews.forEach(e->{
-			e.setSubList(beanSearcher.searchAll(SysCorpFollowView.SysCorpFollowRelateView.class, MapUtils.builder().field(SysCorpFollowView.SysCorpFollowRelateView::getMid, e.getMid()).build()));
-		});
 		return GatewayResponse.SUCCESS.newBuilder().toResult(sysCorpFollowViews);
 	}