模块信息表，添加排序字段

src/main/java/cn/timer/api/bean/qyxx/CmsContentModular.java

@@ -54,4 +54,7 @@ public class CmsContentModular extends Model<CmsContentModular> {
 	@ApiModelProperty(value = "0- 开启  1-关闭", example = "0")
 	@ApiModelProperty(value = "0- 开启  1-关闭", example = "0")
 	private Integer isOpen;
 	private Integer isOpen;
 
 
+	@ApiModelProperty(value = "排序", example = "0")
+	private Integer sort;
+
 }
 }

src/main/java/cn/timer/api/controller/qyxx/CmsController.java

@@ -95,7 +95,10 @@ public class CmsController {
 		MPJQueryWrapper<CmsContent> queryWrapper = new MPJQueryWrapper<>();
 		MPJQueryWrapper<CmsContent> queryWrapper = new MPJQueryWrapper<>();
 		queryWrapper.select("t.id", "t.title", "t.author", "t.releasetime", "t.fmtpath")
 		queryWrapper.select("t.id", "t.title", "t.author", "t.releasetime", "t.fmtpath")
 				.leftJoin("cms_content_read ccr on t.id = ccr.cms_content_id");
 				.leftJoin("cms_content_read ccr on t.id = ccr.cms_content_id");
-		queryWrapper.eq("t.releasestate", 0).and(!StringUtils.isEmpty(userBean.getEmpNum()), wq -> wq.eq("t.open_status", 1).or(true,q -> q.eq("t.open_status", 0).eq("ccr.user_id",userBean.getEmpNum())))
+		queryWrapper.eq("t.releasestate", 0)
+				.and(!StringUtils.isEmpty(userBean.getEmpNum()), wq -> wq.eq("t.open_status", 1)
+						.or(true,q -> q.eq("t.open_status", 0).eq("ccr.user_id",userBean.getEmpNum()))
+						.or(true,q -> q.eq("t.open_status", 0).eq("t.userid",userBean.getEmpNum())))
 				.eq("t.organization_id", orgCode)
 				.eq("t.organization_id", orgCode)
 				.groupBy("t.id")
 				.groupBy("t.id")
 				.orderByDesc("t.releasetime").last("limit 6");
 				.orderByDesc("t.releasetime").last("limit 6");
@@ -155,7 +158,10 @@ public class CmsController {
 			MPJQueryWrapper<CmsContent> queryWrapper = new MPJQueryWrapper<>();
 			MPJQueryWrapper<CmsContent> queryWrapper = new MPJQueryWrapper<>();
 			queryWrapper.select("t.id", "t.modularid", "t.title", "t.author", "t.releasetime")
 			queryWrapper.select("t.id", "t.modularid", "t.title", "t.author", "t.releasetime")
 					.leftJoin("cms_content_read ccr on t.id = ccr.cms_content_id");
 					.leftJoin("cms_content_read ccr on t.id = ccr.cms_content_id");
-			queryWrapper.eq("t.releasestate", 0).and(!StringUtils.isEmpty(userBean.getEmpNum()), wq -> wq.eq("t.open_status", 1).or(true,q -> q.eq("t.open_status", 0).eq("ccr.user_id",userBean.getEmpNum())))
+			queryWrapper.eq("t.releasestate", 0)
+					.and(!StringUtils.isEmpty(userBean.getEmpNum()), wq -> wq.eq("t.open_status", 1)
+							.or(true,q -> q.eq("t.open_status", 0).eq("ccr.user_id",userBean.getEmpNum()))
+							.or(true,q -> q.eq("t.open_status", 0).eq("t.userid",userBean.getEmpNum())))
 					.eq("t.organization_id", userBean.getOrgCode()).eq("t.modularid", id)
 					.eq("t.organization_id", userBean.getOrgCode()).eq("t.modularid", id)
 					.groupBy("t.id")
 					.groupBy("t.id")
 					.orderByDesc("t.releasetime")
 					.orderByDesc("t.releasetime")
@@ -175,7 +181,8 @@ public class CmsController {
 	public Result<Object> getxxfl(@CurrentUser UserBean userBean) {
 	public Result<Object> getxxfl(@CurrentUser UserBean userBean) {
 		return ResultUtil.data(CmsContentModular.builder().build().selectList(new QueryWrapper<CmsContentModular>()
 		return ResultUtil.data(CmsContentModular.builder().build().selectList(new QueryWrapper<CmsContentModular>()
 //				.eq("organization_id", userBean.getOrgCode())
 //				.eq("organization_id", userBean.getOrgCode())
-				.eq("is_open", 0)), "查询分类成功！");
+				.eq("is_open", 0)
+		.orderByAsc("sort")), "查询分类成功！");
 	}
 	}
 
 
 	/**
 	/**
@@ -197,6 +204,9 @@ public class CmsController {
 //		qynr.setXxbh("XX" + i++);
 //		qynr.setXxbh("XX" + i++);
 
 
 		Boolean a = qynr.getId() == null;
 		Boolean a = qynr.getId() == null;
+		if(a){
+			qynr.setUserid(empNum);
+		}
 		if (a && qynr.getPublisher() == null)
 		if (a && qynr.getPublisher() == null)
 			qynr.setPublisher(empNum);
 			qynr.setPublisher(empNum);
 		qynr.setOrganizationId(orgCode);
 		qynr.setOrganizationId(orgCode);