微信移动端支付

modules/report/src/main/java/com/jeesite/modules/report/dao/ResearchBriefReportLabelDao.java

@@ -22,4 +22,6 @@ public interface ResearchBriefReportLabelDao extends CrudDao<ResearchBriefReport
     long findPageCount(@Param("info") ResearchBriefReportLabel researchBriefReportLabel);
 
     List<ResearchBriefReportLabel> findChildList();
+
+    List<ResearchBriefReportLabel> findLabelByReport(@Param("info") ResearchBriefReportLabel researchBriefReportLabel);
 }

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

@@ -34,6 +34,9 @@ public class ResearchBriefReportLabel extends DataEntity<ResearchBriefReportLabe
 
 	private String notParentId;
 
+	//1-查存在简报的标签
+	private Integer existReport;
+
 	public ResearchBriefReportLabel() {
 		this(null);
 	}
@@ -99,4 +102,12 @@ public class ResearchBriefReportLabel extends DataEntity<ResearchBriefReportLabe
 	public void setNotParentId(String notParentId) {
 		this.notParentId = notParentId;
 	}
+
+	public Integer getExistReport() {
+		return existReport;
+	}
+
+	public void setExistReport(Integer existReport) {
+		this.existReport = existReport;
+	}
 }

modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java

@@ -160,7 +160,8 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 		}
 		ResearchBriefReportLabel where = new ResearchBriefReportLabel();
 		where.setParentId(parentId);
-		return researchBriefReportLabelDao.findList(where);
+		where.setExistReport(1);
+		return researchBriefReportLabelDao.findLabelByReport(where);
 	}
 
 	public ResearchBriefReport researchBriefReportForm(ResearchBriefReport researchBriefReport, HttpServletRequest request) {
@@ -277,6 +278,7 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 		label.setPageNo(1);
 		label.setPageSize(20);
 		label.setNotParentId("0");
-		return researchBriefReportLabelDao.findPage(label);
+		label.setExistReport(1);
+		return researchBriefReportLabelDao.findLabelByReport(label);
 	}
 }

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

@@ -50,6 +50,12 @@
         <if test="info.notParentId != null and info.notParentId != ''">
             and a.parent_id != #{info.notParentId}
         </if>
+        <if test="info.existReport != null and info.existReport == 1">
+            AND (EXISTS (
+            SELECT 1
+            FROM research_brief_report_label_relevancy lr
+            WHERE lr.parent_lable_id = a.id or lr.lable_id = a.id))
+        </if>
     </sql>
 
     <select id="findPageCount" resultType="java.lang.Long">
@@ -63,4 +69,14 @@
         where a.status = '0' and a.parent_id != '0'
         order by a.sort_num
     </select>
+
+    <select id="findLabelByReport" resultType="com.jeesite.modules.report.entity.ResearchBriefReportLabel">
+        select * from research_brief_report_label a
+        where a.status = '0'
+        <include refid="whereStr02"/>
+        order by a.sort_num
+        <if test="info.pageSize != null">
+            limit ${info.pageSize * (info.pageNo - 1)},${info.pageSize}
+        </if>
+    </select>
 </mapper>

web/src/main/resources/config/application.yml

@@ -910,8 +910,9 @@ msg:
     fromAddress: wpqingfeng@163.com
     fromPassword: GEbp9QBYWpeRsWFM
     fromHostName: smtp.163.com
-    sslOnConnect: false
+    sslOnConnect: true
     sslSmtpPort: 994
+    smtpPort: 465
 #
 #  # 短信网关
 #  sms: