--no commit message

com.zrqx.bg.resource/src/main/java/com/zrqx/bg/resource/mapper/comment/CommentMapper.java

@@ -30,6 +30,10 @@ public interface CommentMapper extends BaseMapper<Comment> {
 		    + " <if test = '" + NOTBLANK + "(query.resourceName)'> "  
 		    + " and b.name like concat(#{query.resourceName},'%') "
 		    + " </if> " 
+		    //上传人（资源归属于哪个出版社）
+		    + " <if test = '" + NOTBLANK + "(query.uploader)'> "  
+			+ " and b.creater = #{query.uploader} "
+		    + " </if> " 
 		    // 评论时间
 		    + " <if test = '" + NOTBLANK + "(query.createTimeStart)'> "  
 		    + " and date(a.createTime) <![CDATA[ >= ]]> #{query.createTimeStart} "

com.zrqx.bg.resource/src/main/java/com/zrqx/bg/resource/mapper/goods/eleresource/EleResourceMapper.java

@@ -61,6 +61,10 @@ public interface EleResourceMapper extends BaseMapper<EleResource>{
 		    + " <if test = '" + NOTBLANK + "(query.status)'> "  
 		    + " and a.status = #{query.status} "
 		    + " </if> "
+		    // 上传人
+		    + " <if test = '" + NOTBLANK + "(query.creater)'> "  
+		    + " and a.creater = #{query.creater} "
+		    + " </if> "
 		    + " group by a.id " 
 			+ " </script> ")
 	List<EleResourcePageVo> page(@Param("query") EleResourceQuery query);

com.zrqx.bg.resource/src/main/java/com/zrqx/bg/resource/service/comment/CommentServiceImpl.java

@@ -12,10 +12,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.zrqx.bg.resource.client.BgMemberClient;
+import com.zrqx.bg.resource.client.BgSysuserClient;
 import com.zrqx.bg.resource.mapper.comment.CommentMapper;
 import com.zrqx.bg.resource.mapper.comment.ReplyMapper;
 import com.zrqx.bg.resource.mapper.goods.phyresource.PhyResourceMapper;
+import com.zrqx.core.commons.redis.BgRedisManage;
 import com.zrqx.core.commons.redis.Redis;
+import com.zrqx.core.enums.BooleanStatusEnum;
 import com.zrqx.core.enums.member.scorerecord.ScoreRecordSourceEnum;
 import com.zrqx.core.enums.resource.comment.CommentStatusEnum;
 import com.zrqx.core.exception.BusinessValidateException;
@@ -51,6 +54,10 @@ public class CommentServiceImpl extends BaseServiceImpl<Comment, Integer> implem
 	private PhyResourceMapper phyResourceMapper;
 	@Autowired
 	private BgMemberClient bgMemberClient;
+	@Autowired
+	private BgSysuserClient bgSysuserClient;
+	@Autowired
+	private BgRedisManage bgRedis;
 	
 	@Override
 	public BaseMapper<Comment> getMapper() {
@@ -61,6 +68,14 @@ public class CommentServiceImpl extends BaseServiceImpl<Comment, Integer> implem
 	public PageInfo<CommentVo> page(PageParam pageParam, CommentQuery query) {
 		if(pageParam.getOrderBy() == null) pageParam.setOrderBy("a.createTime desc");
 		startPage(pageParam);
+		//不同出版社只能看到自己所管理的资源评论
+		CallBack<User> data = bgSysuserClient.getInfo(bgRedis.getOpId());
+		if(data != null && data.getData() !=null){
+			User user = data.getData();
+			if(BooleanStatusEnum.YES.getCode().equals(user.getIsNot())){
+				query.setUploader(user.getUserId());
+			}
+		}
 		List<CommentVo> commentVos = commentMapper.page(query);
 		commentVos.parallelStream().forEach(commentVo -> {
 			commentVo.setStatusZh(CommentStatusEnum.getName(commentVo.getStatus()));

com.zrqx.bg.resource/src/main/java/com/zrqx/bg/resource/service/goods/eleresource/EleResourceServiceImpl.java

@@ -11,11 +11,14 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.zrqx.bg.resource.client.BgSysuserClient;
 import com.zrqx.bg.resource.manage.diytype.DiyTypeManage;
 import com.zrqx.bg.resource.manage.goods.eleresource.EleResourceManage;
 import com.zrqx.bg.resource.manage.label.LabelManage;
 import com.zrqx.bg.resource.manage.resource.ResourceStatusManage;
 import com.zrqx.bg.resource.mapper.goods.eleresource.EleResourceMapper;
+import com.zrqx.core.commons.redis.BgRedisManage;
+import com.zrqx.core.enums.BooleanStatusEnum;
 import com.zrqx.core.enums.resource.goods.GoodsStatusEnum;
 import com.zrqx.core.exception.BusinessValidateException;
 import com.zrqx.core.form.resource.bg.goods.GoodsDiyTypeForm;
@@ -28,9 +31,11 @@ import com.zrqx.core.form.resource.bg.goods.eleresource.EleResourceQuery;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.goods.eleresource.EleResource;
 import com.zrqx.core.model.resource.goods.phyresource.PhyResource;
+import com.zrqx.core.model.sysuser.user.User;
 import com.zrqx.core.service.BaseModelServiceImpl;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.resource.bg.goods.eleresource.EleResourcePageVo;
 import com.zrqx.core.vo.resource.bg.goods.eleresource.EleResourceVo;
  /** 
@@ -53,6 +58,10 @@ public class EleResourceServiceImpl extends BaseModelServiceImpl<EleResource, St
 	private LabelManage labelManage;
 	@Autowired
 	private ResourceStatusManage statusManage;
+	@Autowired
+	private BgSysuserClient bgSysuserClient;
+	@Autowired
+	private BgRedisManage redis;
 	
 	@Override
 	public BaseMapper<EleResource> getMapper() {
@@ -106,8 +115,16 @@ public class EleResourceServiceImpl extends BaseModelServiceImpl<EleResource, St
 	@Override
 	public PageInfo<EleResourcePageVo> page(PageParam pageParam,
 			EleResourceQuery query) {
+		
 		if(pageParam.getOrderBy() == null) pageParam.setOrderBy("uploadTime desc");
 		startPage(pageParam);
+		CallBack<User> data = bgSysuserClient.getInfo(redis.getOpId());
+		if(data != null && data.getData() !=null){
+			User user = data.getData();
+			if(BooleanStatusEnum.YES.getCode().equals(user.getIsNot())){
+				query.setCreater(user.getUserId());
+			}
+		}
 		List<EleResourcePageVo> eleResourcePageVos = eleResourceMapper.page(query);
 		eleResourcePageVos.parallelStream().forEach(eleResourcePageVo -> {
 			eleResourcePageVo.setStatusZh(GoodsStatusEnum.getName(eleResourcePageVo.getStatus()));

com.zrqx.bg.resource/src/main/java/com/zrqx/bg/resource/service/goods/phyresource/PhyResourceServiceImpl.java

@@ -247,6 +247,11 @@ public class PhyResourceServiceImpl extends BaseModelServiceImpl<PhyResource, St
 	@Override
 	public PageInfo<PhyResourcePageVo> page(PageParam pageParam, PhyResourceQuery query) {
 		if(pageParam.getOrderBy() == null) pageParam.setOrderBy("createTime desc");
+		//根据登陆人查询登陆人所属出版社的名称进行筛选，若有归属出版社，则根据对应的出版社名称进行筛选；若无归属出版社，则拥有所有实体资源的权限
+		String name = this.getPressInfo();
+		if(StringUtils.isNotEmpty(name)){
+			query.setPublisher(name);
+		}
 		query.setIsPDF("PDF".equalsIgnoreCase(query.getFilter()));
 		query.setIsPrice("price".equalsIgnoreCase(query.getFilter()));
 		startPage(pageParam);

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/comment/CommentQuery.java

@@ -16,5 +16,7 @@ public class CommentQuery {
 	private String createTimeStart;
 	@ApiModelProperty("评论时间结束")
 	private String createTimeEnd;
+	@ApiModelProperty("上传人")
+	private String uploader;
 	
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/goods/eleresource/EleResourceQuery.java

@@ -30,4 +30,8 @@ public class EleResourceQuery {
 	@ApiModelProperty("上传时间终止")
 	private String uploadTimeEnd;
 	
+	@ApiModelProperty("创建人")
+	protected String creater;
+	
+	
 }