LAPTOP-KB9HII50\70708 1 gadu atpakaļ
vecāks
revīzija
b29e45dc89

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/hospital/article/KnowledgeArticleDictDO.java

@ -40,7 +40,7 @@ public class KnowledgeArticleDictDO extends UuidIdentityEntity {
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date updateTime;  // 编辑时间
	private Integer del; // 是否删除,1正常,0删除
	private Integer status;// 0未审核 1已审核
	private Integer status;// 0未审核 1已审核 2已退回
	private String cancelReason;//退回理由
	private Integer used;//常用数
	private Integer readCount;//已读数

+ 4 - 4
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/article/ArticleDictEndpoint.java

@ -66,10 +66,10 @@ public class ArticleDictEndpoint extends EnvelopRestEndpoint {
		try {
			String userId=getUID();
			BaseDoctorRoleDO roleDO = doctorRoleDao.findByDoctorCodeAndRoleCode(userId, CommonContant.DR_ARTICLEREVIEWER);
			boolean queryAll=true;
//			if (roleDO!=null){
//				queryAll=true;
//			}
			boolean queryAll=false;
			if (roleDO!=null){
				queryAll=true;
			}
			if (queryAll){
				if(StringUtils.isBlank(filters)){
					filters=filters+"del=1";