按钮权限

modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReport.java

@@ -28,6 +28,7 @@ import java.util.Date;
 		@Column(name="second_label_id", attrName="secondLabelId", label="二级标签id"),
 		@Column(name="use_down_pay", attrName="useDownPay", label="下载是否需要支付 0否 1是"),
 		@Column(name="use_down_pay_price", attrName="useDownPayPrice", label="下载需要支付单价"),
+		@Column(name="use_choiceness", attrName="useChoiceness", label="是否精选 0否 1是"),
 	}, orderBy="a.update_date DESC"
 )
 public class ResearchBriefReport extends DataEntity<ResearchBriefReport> {
@@ -41,6 +42,7 @@ public class ResearchBriefReport extends DataEntity<ResearchBriefReport> {
 	private String secondLabelId;		// 二级标签id
 	private String useDownPay;		// 下载是否需要支付 0否 1是
 	private BigDecimal useDownPayPrice;		// 下载需要支付单价
+	private String useChoiceness; 	//是否精选 0否 1是
 	private Date publishDateStr;	//发布日期起
 	private Date publishDateEnd;	//发布日期止
 	private String topLabelName;		// 一级标签id
@@ -135,6 +137,14 @@ public class ResearchBriefReport extends DataEntity<ResearchBriefReport> {
 		this.useDownPayPrice = useDownPayPrice;
 	}
 
+	public String getUseChoiceness() {
+		return useChoiceness;
+	}
+
+	public void setUseChoiceness(String useChoiceness) {
+		this.useChoiceness = useChoiceness;
+	}
+
 	public Date getPublishDateStr() {
 		return publishDateStr;
 	}

modules/report/src/main/java/com/jeesite/modules/report/web/ResearchBriefReportController.java

@@ -84,7 +84,7 @@ public class ResearchBriefReportController extends BaseController {
 	/**
 	 * 保存数据
 	 */
-//	@RequiresPermissions("report:researchBriefReport:edit")
+	@RequiresPermissions("basedata:briefing:edit")
 	@PostMapping(value = "save")
 	@ResponseBody
 	public String save(@Validated ResearchBriefReport researchBriefReport) {
@@ -112,7 +112,7 @@ public class ResearchBriefReportController extends BaseController {
 	/**
 	 * 删除数据
 	 */
-//	@RequiresPermissions("report:researchBriefReport:edit")
+	@RequiresPermissions("basedata:briefing:del")
 	@RequestMapping(value = "delete")
 	@ResponseBody
 	public String delete(ResearchBriefReport researchBriefReport) {

modules/report/src/main/java/com/jeesite/modules/report/web/ResearchBriefReportLabelController.java

@@ -110,7 +110,7 @@ public class ResearchBriefReportLabelController extends BaseController {
 	/**
 	 * 保存数据
 	 */
-//	@RequiresPermissions("report:researchBriefReportLabel:edit")
+	@RequiresPermissions("basedata:briefingClassify:edit")
 	@PostMapping(value = "save")
 	@ResponseBody
 	public String save(@Validated ResearchBriefReportLabel researchBriefReportLabel) {
@@ -136,7 +136,7 @@ public class ResearchBriefReportLabelController extends BaseController {
 	/**
 	 * 删除数据
 	 */
-//	@RequiresPermissions("report:researchBriefReportLabel:edit")
+	@RequiresPermissions("basedata:briefingClassify:del")
 	@RequestMapping(value = "delete")
 	@ResponseBody
 	public String delete(ResearchBriefReportLabel researchBriefReportLabel) {

modules/report/src/main/java/com/jeesite/modules/report/web/WebsiteUserOrderController.java

@@ -49,7 +49,7 @@ public class WebsiteUserOrderController extends BaseController {
 	/**
 	 * 查询列表数据
 	 */
-//	@RequiresPermissions("report:websiteUserOrder:view")
+	@RequiresPermissions("basedata:userOrder:view")
 	@RequestMapping(value = "listData")
 	@ResponseBody
 	public Page<WebsiteUserOrder> listData(WebsiteUserOrder websiteUserOrder, HttpServletRequest request, HttpServletResponse response) {

modules/report/src/main/resources/mappings/modules/report/ResearchBriefReportDao.xml

@@ -27,6 +27,7 @@
         <if test="rr.secondLabelId != null and rr.secondLabelId != ''">and second_label_id = #{rr.secondLabelId}</if>
         <if test="rr.useDownPay != null and rr.useDownPay != ''">and use_down_pay = #{rr.useDownPay}</if>
         <if test="rr.notId != null and rr.notId != ''">and id != #{rr.notId}</if>
+        <if test="rr.useChoiceness != null and rr.useChoiceness != ''">and use_choiceness = #{rr.useChoiceness}</if>
     </sql>
 
     <select id="findResearchBriefReportList"