增加热门单事项

single-manager/src/main/java/com/mortals/xhx/module/apply/service/impl/MatterApplyServiceImpl.java

@@ -146,6 +146,8 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
             if(loginName.equals("admin")) {
                 params.setDeptCode(null);
             }
+        }else {
+            throw new AppException("token无效");
         }
         MatterApplyQuery query = new MatterApplyQuery();
         BeanUtils.copyProperties(params,query);

single-manager/src/main/java/com/mortals/xhx/module/single/model/SingleMatterEntity.java

 package com.mortals.xhx.module.single.model;
-
 import java.util.List;
 import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.single.model.vo.SingleMatterVo;
+import lombok.Data;
 /**
-* 单事项实体对象
-*
-* @author zxfei
-* @date 2023-03-21
-*/
-
+ * 单事项实体对象
+ *
+ * @author zxfei
+ * @date 2025-03-25
+ */
+@Data
 public class SingleMatterEntity extends SingleMatterVo {
     private static final long serialVersionUID = 1L;
 
@@ -72,210 +75,10 @@ public class SingleMatterEntity extends SingleMatterVo {
      * 事项详情链接
      */
     private String url;
-
-
-
-    public SingleMatterEntity(){}
-    /**
-    * 获取 站点id
-    * @return Long
-    */
-    public Long getSiteId(){
-        return siteId;
-    }
-    /**
-    * 设置 站点id
-    * @param siteId
-    */
-    public void setSiteId(Long siteId){
-        this.siteId = siteId;
-    }
-    /**
-    * 获取 站点名称
-    * @return String
-    */
-    public String getSiteName(){
-        return siteName;
-    }
-    /**
-    * 设置 站点名称
-    * @param siteName
-    */
-    public void setSiteName(String siteName){
-        this.siteName = siteName;
-    }
-    /**
-    * 获取 站点事项id
-    * @return Long
-    */
-    public Long getSiteMatterId(){
-        return siteMatterId;
-    }
-    /**
-    * 设置 站点事项id
-    * @param siteMatterId
-    */
-    public void setSiteMatterId(Long siteMatterId){
-        this.siteMatterId = siteMatterId;
-    }
-    /**
-    * 获取 基础事项ID
-    * @return Long
-    */
-    public Long getMatterId(){
-        return matterId;
-    }
-    /**
-    * 设置 基础事项ID
-    * @param matterId
-    */
-    public void setMatterId(Long matterId){
-        this.matterId = matterId;
-    }
-    /**
-    * 获取 事项名称
-    * @return String
-    */
-    public String getMatterName(){
-        return matterName;
-    }
-    /**
-    * 设置 事项名称
-    * @param matterName
-    */
-    public void setMatterName(String matterName){
-        this.matterName = matterName;
-    }
-    /**
-    * 获取 事项编码
-    * @return String
-    */
-    public String getMatterCode(){
-        return matterCode;
-    }
-    /**
-    * 设置 事项编码
-    * @param matterCode
-    */
-    public void setMatterCode(String matterCode){
-        this.matterCode = matterCode;
-    }
-    /**
-    * 获取 部门ID
-    * @return Long
-    */
-    public Long getDeptId(){
-        return deptId;
-    }
-    /**
-    * 设置 部门ID
-    * @param deptId
-    */
-    public void setDeptId(Long deptId){
-        this.deptId = deptId;
-    }
-    /**
-    * 获取 部门名称
-    * @return String
-    */
-    public String getDeptName(){
-        return deptName;
-    }
-    /**
-    * 设置 部门名称
-    * @param deptName
-    */
-    public void setDeptName(String deptName){
-        this.deptName = deptName;
-    }
     /**
-    * 获取 部门编码
-    * @return String
+     * 热门事项
      */
-    public String getDeptCode(){
-        return deptCode;
-    }
-    /**
-    * 设置 部门编码
-    * @param deptCode
-    */
-    public void setDeptCode(String deptCode){
-        this.deptCode = deptCode;
-    }
-    /**
-    * 获取 事项来源
-    * @return Integer
-    */
-    public Integer getSource(){
-        return source;
-    }
-    /**
-    * 设置 事项来源
-    * @param source
-    */
-    public void setSource(Integer source){
-        this.source = source;
-    }
-    /**
-    * 获取 事项类型
-    * @return String
-    */
-    public String getEventTypeShow(){
-        return eventTypeShow;
-    }
-    /**
-    * 设置 事项类型
-    * @param eventTypeShow
-    */
-    public void setEventTypeShow(String eventTypeShow){
-        this.eventTypeShow = eventTypeShow;
-    }
-    /**
-    * 获取 浏览次数
-    * @return Long
-    */
-    public Long getViewsCount(){
-        return viewsCount;
-    }
-    /**
-    * 设置 浏览次数
-    * @param viewsCount
-    */
-    public void setViewsCount(Long viewsCount){
-        this.viewsCount = viewsCount;
-    }
-    /**
-    * 获取 是否生成本地附件
-    * @return Integer
-    */
-    public Integer getIsConvert(){
-        return isConvert;
-    }
-    /**
-    * 设置 是否生成本地附件
-    * @param isConvert
-    */
-    public void setIsConvert(Integer isConvert){
-        this.isConvert = isConvert;
-    }
-    /**
-    * 获取 事项详情链接
-    * @return String
-    */
-    public String getUrl(){
-        return url;
-    }
-    /**
-    * 设置 事项详情链接
-    * @param url
-    */
-    public void setUrl(String url){
-        this.url = url;
-    }
-
-
-
-
+    private Integer hot;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -292,53 +95,21 @@ public class SingleMatterEntity extends SingleMatterVo {
         return false;
     }
 
-    public String toString(){
-        StringBuilder sb = new StringBuilder("");
-        sb.append(",siteId:").append(getSiteId());
-        sb.append(",siteName:").append(getSiteName());
-        sb.append(",siteMatterId:").append(getSiteMatterId());
-        sb.append(",matterId:").append(getMatterId());
-        sb.append(",matterName:").append(getMatterName());
-        sb.append(",matterCode:").append(getMatterCode());
-        sb.append(",deptId:").append(getDeptId());
-        sb.append(",deptName:").append(getDeptName());
-        sb.append(",deptCode:").append(getDeptCode());
-        sb.append(",source:").append(getSource());
-        sb.append(",eventTypeShow:").append(getEventTypeShow());
-        sb.append(",viewsCount:").append(getViewsCount());
-        sb.append(",isConvert:").append(getIsConvert());
-        sb.append(",url:").append(getUrl());
-        return sb.toString();
-    }
-
     public void initAttrValue(){
-
         this.siteId = null;
-
         this.siteName = "";
-
         this.siteMatterId = null;
-
         this.matterId = null;
-
         this.matterName = "";
-
         this.matterCode = "";
-
         this.deptId = null;
-
         this.deptName = "";
-
         this.deptCode = "";
-
-            this.source = null;
-
+        this.source = 0;
         this.eventTypeShow = "";
-
         this.viewsCount = 0L;
-
         this.isConvert = 0;
-
         this.url = "";
+        this.hot = 0;
     }
 }
\ No newline at end of file

single-manager/src/main/java/com/mortals/xhx/module/single/model/SingleMatterQuery.java

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.single.model;
 import java.util.List;
 import com.mortals.xhx.module.single.model.SingleMatterEntity;
 /**
-* 单事项查询对象
-*
-* @author zxfei
-* @date 2023-03-21
-*/
+ * 单事项查询对象
+ *
+ * @author zxfei
+ * @date 2025-03-25
+ */
 public class SingleMatterQuery extends SingleMatterEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -164,6 +164,21 @@ public class SingleMatterQuery extends SingleMatterEntity {
 
     /** 事项详情链接排除列表 */
     private List <String> urlNotList;
+    /** 开始 热门事项 */
+    private Integer hotStart;
+
+    /** 结束 热门事项 */
+    private Integer hotEnd;
+
+    /** 增加 热门事项 */
+    private Integer hotIncrement;
+
+    /** 热门事项列表 */
+    private List <Integer> hotList;
+
+    /** 热门事项排除列表 */
+    private List <Integer> hotNotList;
+
     /** 开始 创建用户 */
     private Long createUserIdStart;
 
@@ -1086,6 +1101,87 @@ public class SingleMatterQuery extends SingleMatterEntity {
         this.urlNotList = urlNotList;
     }
 
+    /**
+     * 获取 开始 热门事项
+     * @return hotStart
+     */
+    public Integer getHotStart(){
+        return this.hotStart;
+    }
+
+    /**
+     * 设置 开始 热门事项
+     * @param hotStart
+     */
+    public void setHotStart(Integer hotStart){
+        this.hotStart = hotStart;
+    }
+
+    /**
+     * 获取 结束 热门事项
+     * @return $hotEnd
+     */
+    public Integer getHotEnd(){
+        return this.hotEnd;
+    }
+
+    /**
+     * 设置 结束 热门事项
+     * @param hotEnd
+     */
+    public void setHotEnd(Integer hotEnd){
+        this.hotEnd = hotEnd;
+    }
+
+    /**
+     * 获取 增加 热门事项
+     * @return hotIncrement
+     */
+    public Integer getHotIncrement(){
+        return this.hotIncrement;
+    }
+
+    /**
+     * 设置 增加 热门事项
+     * @param hotIncrement
+     */
+    public void setHotIncrement(Integer hotIncrement){
+        this.hotIncrement = hotIncrement;
+    }
+
+    /**
+     * 获取 热门事项
+     * @return hotList
+     */
+    public List<Integer> getHotList(){
+        return this.hotList;
+    }
+
+    /**
+     * 设置 热门事项
+     * @param hotList
+     */
+    public void setHotList(List<Integer> hotList){
+        this.hotList = hotList;
+    }
+
+    /**
+     * 获取 热门事项
+     * @return hotNotList
+     */
+    public List<Integer> getHotNotList(){
+        return this.hotNotList;
+    }
+
+    /**
+     * 设置 热门事项
+     * @param hotNotList
+     */
+    public void setHotNotList(List<Integer> hotNotList){
+        this.hotNotList = hotNotList;
+    }
+
+
     /**
      * 获取 开始 创建用户
      * @return createUserIdStart
@@ -1877,6 +1973,60 @@ public class SingleMatterQuery extends SingleMatterEntity {
         return this;
     }
 
+    /**
+     * 设置  热门事项
+     * @param hot
+     */
+    public SingleMatterQuery hot(Integer hot){
+        setHot(hot);
+        return this;
+    }
+
+    /**
+     * 设置 开始 热门事项
+     * @param hotStart
+     */
+    public SingleMatterQuery hotStart(Integer hotStart){
+        this.hotStart = hotStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 热门事项
+     * @param hotEnd
+     */
+    public SingleMatterQuery hotEnd(Integer hotEnd){
+        this.hotEnd = hotEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 热门事项
+     * @param hotIncrement
+     */
+    public SingleMatterQuery hotIncrement(Integer hotIncrement){
+        this.hotIncrement = hotIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 热门事项
+     * @param hotList
+     */
+    public SingleMatterQuery hotList(List<Integer> hotList){
+        this.hotList = hotList;
+        return this;
+    }
+
+    /**
+     * 设置 热门事项
+     * @param hotNotList
+     */
+    public SingleMatterQuery hotNotList(List<Integer> hotNotList){
+        this.hotNotList = hotNotList;
+        return this;
+    }
+
     /**
      * 设置  创建用户
      * @param createUserId

single-manager/src/main/java/com/mortals/xhx/module/single/web/SingleMatterController.java

@@ -45,7 +45,8 @@ public class SingleMatterController extends BaseCRUDJsonBodyMappingController<Si
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "source", paramService.getParamBySecondOrganize("SiteMatter","source"));
-        this.addDict(model, "isConvert", paramService.getParamBySecondOrganize("SingleMatter","isConvert"));
+        this.addDict(model, "isConvert", paramService.getParamBySecondOrganize("Matter","isOnline"));
+        this.addDict(model, "hot", paramService.getParamBySecondOrganize("Matter","isOnline"));
         super.init(model, context);
     }
 
@@ -64,6 +65,7 @@ public class SingleMatterController extends BaseCRUDJsonBodyMappingController<Si
     @Override
     protected void doListBefore(SingleMatterEntity query, Map<String, Object> model, Context context) throws AppException {
         List<OrderCol> orderColList = new ArrayList<>();
+        orderColList.add(new OrderCol("hot", "desc"));
         orderColList.add(new OrderCol("viewsCount", "desc"));
         orderColList.add(new OrderCol("createTime", "desc"));
         query.setOrderColList(orderColList);

single-manager/src/main/resources/sqlmap/module/single/SingleMatterMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.single.dao.ibatis.SingleMatterDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -20,14 +20,13 @@
         <result property="viewsCount" column="viewsCount" />
         <result property="isConvert" column="isConvert" />
         <result property="url" column="url" />
+        <result property="hot" column="hot" />
         <result property="createUserId" column="createUserId" />
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
-            
     </resultMap>
 
-
     <!-- 表所有列 -->
     <sql id="_columns">
         <trim suffixOverrides="," suffix="">
@@ -76,6 +75,9 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('url') or colPickMode == 1 and data.containsKey('url')))">
                 a.url,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hot') or colPickMode == 1 and data.containsKey('hot')))">
+                a.hot,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
                 a.createUserId,
             </if>
@@ -93,18 +95,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="SingleMatterEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_single_matter
-        (siteId,siteName,siteMatterId,matterId,matterName,matterCode,deptId,deptName,deptCode,source,eventTypeShow,viewsCount,isConvert,url,createUserId,createTime,updateUserId,updateTime)
+        (siteId,siteName,siteMatterId,matterId,matterName,matterCode,deptId,deptName,deptCode,source,eventTypeShow,viewsCount,isConvert,url,hot,createUserId,createTime,updateUserId,updateTime)
         VALUES
-        (#{siteId},#{siteName},#{siteMatterId},#{matterId},#{matterName},#{matterCode},#{deptId},#{deptName},#{deptCode},#{source},#{eventTypeShow},#{viewsCount},#{isConvert},#{url},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{siteId},#{siteName},#{siteMatterId},#{matterId},#{matterName},#{matterCode},#{deptId},#{deptName},#{deptCode},#{source},#{eventTypeShow},#{viewsCount},#{isConvert},#{url},#{hot},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_single_matter
-        (siteId,siteName,siteMatterId,matterId,matterName,matterCode,deptId,deptName,deptCode,source,eventTypeShow,viewsCount,isConvert,url,createUserId,createTime,updateUserId,updateTime)
+        (siteId,siteName,siteMatterId,matterId,matterName,matterCode,deptId,deptName,deptCode,source,eventTypeShow,viewsCount,isConvert,url,hot,createUserId,createTime,updateUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.siteName},#{item.siteMatterId},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.deptId},#{item.deptName},#{item.deptCode},#{item.source},#{item.eventTypeShow},#{item.viewsCount},#{item.isConvert},#{item.url},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.siteId},#{item.siteName},#{item.siteMatterId},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.deptId},#{item.deptName},#{item.deptCode},#{item.source},#{item.eventTypeShow},#{item.viewsCount},#{item.isConvert},#{item.url},#{item.hot},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -177,6 +179,12 @@
             <if test="(colPickMode==0 and data.containsKey('url')) or (colPickMode==1 and !data.containsKey('url'))">
                 a.url=#{data.url},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('hot')) or (colPickMode==1 and !data.containsKey('hot'))">
+                a.hot=#{data.hot},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('hotIncrement')) or (colPickMode==1 and !data.containsKey('hotIncrement'))">
+                a.hot=ifnull(a.hot,0) + #{data.hotIncrement},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
                 a.createUserId=#{data.createUserId},
             </if>
@@ -340,6 +348,18 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="hot=(case" suffix="ELSE hot end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('hot')) or (colPickMode==1 and !item.containsKey('hot'))">
+                            when a.id=#{item.id} then #{item.hot}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('hotIncrement')) or (colPickMode==1 and !item.containsKey('hotIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.hot,0) + #{item.hotIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
             <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <choose>
@@ -489,6 +509,10 @@
     <!-- 条件映射-代参数 -->
     <sql id="_condition_param_">
         <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="permissionSql != null and permissionSql != ''">
+            ${permissionSql}
+        </if>
+
         <if test="conditionParamRef.containsKey('id')">
             <if test="conditionParamRef.id != null">
                 ${_conditionType_} a.id=#{${_conditionParam_}.id}
@@ -502,13 +526,13 @@
                 ${_conditionType_} a.id is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('idList')">
+        <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
             ${_conditionType_} a.id in
             <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('idNotList')">
+        <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
             ${_conditionType_} a.id not in
             <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -529,13 +553,13 @@
                 ${_conditionType_} a.siteId is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('siteIdList')">
+        <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
             ${_conditionType_} a.siteId in
             <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('siteIdNotList')">
+        <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
             ${_conditionType_} a.siteId not in
             <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -557,13 +581,13 @@
                 ${_conditionType_} a.siteName is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('siteNameList')">
+        <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
             ${_conditionType_} a.siteName in
             <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('siteNameNotList')">
+        <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
             ${_conditionType_} a.siteName not in
             <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -577,13 +601,13 @@
                 ${_conditionType_} a.siteMatterId is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('siteMatterIdList')">
+        <if test="conditionParamRef.containsKey('siteMatterIdList') and conditionParamRef.siteMatterIdList.size() > 0">
             ${_conditionType_} a.siteMatterId in
             <foreach collection="conditionParamRef.siteMatterIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('siteMatterIdNotList')">
+        <if test="conditionParamRef.containsKey('siteMatterIdNotList') and conditionParamRef.siteMatterIdNotList.size() > 0">
             ${_conditionType_} a.siteMatterId not in
             <foreach collection="conditionParamRef.siteMatterIdNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -604,13 +628,13 @@
                 ${_conditionType_} a.matterId is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('matterIdList')">
+        <if test="conditionParamRef.containsKey('matterIdList') and conditionParamRef.matterIdList.size() > 0">
             ${_conditionType_} a.matterId in
             <foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('matterIdNotList')">
+        <if test="conditionParamRef.containsKey('matterIdNotList') and conditionParamRef.matterIdNotList.size() > 0">
             ${_conditionType_} a.matterId not in
             <foreach collection="conditionParamRef.matterIdNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -632,13 +656,13 @@
                 ${_conditionType_} a.matterName is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('matterNameList')">
+        <if test="conditionParamRef.containsKey('matterNameList') and conditionParamRef.matterNameList.size() > 0">
             ${_conditionType_} a.matterName in
             <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('matterNameNotList')">
+        <if test="conditionParamRef.containsKey('matterNameNotList') and conditionParamRef.matterNameNotList.size() > 0">
             ${_conditionType_} a.matterName not in
             <foreach collection="conditionParamRef.matterNameNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -653,13 +677,13 @@
                 ${_conditionType_} a.matterCode is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('matterCodeList')">
+        <if test="conditionParamRef.containsKey('matterCodeList') and conditionParamRef.matterCodeList.size() > 0">
             ${_conditionType_} a.matterCode in
             <foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('matterCodeNotList')">
+        <if test="conditionParamRef.containsKey('matterCodeNotList') and conditionParamRef.matterCodeNotList.size() > 0">
             ${_conditionType_} a.matterCode not in
             <foreach collection="conditionParamRef.matterCodeNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -673,13 +697,13 @@
                 ${_conditionType_} a.deptId is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('deptIdList')">
+        <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
             ${_conditionType_} a.deptId in
             <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('deptIdNotList')">
+        <if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
             ${_conditionType_} a.deptId not in
             <foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -701,13 +725,13 @@
                 ${_conditionType_} a.deptName is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('deptNameList')">
+        <if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
             ${_conditionType_} a.deptName in
             <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('deptNameNotList')">
+        <if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
             ${_conditionType_} a.deptName not in
             <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -722,13 +746,13 @@
                 ${_conditionType_} a.deptCode is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('deptCodeList')">
+        <if test="conditionParamRef.containsKey('deptCodeList') and conditionParamRef.deptCodeList.size() > 0">
             ${_conditionType_} a.deptCode in
             <foreach collection="conditionParamRef.deptCodeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('deptCodeNotList')">
+        <if test="conditionParamRef.containsKey('deptCodeNotList') and conditionParamRef.deptCodeNotList.size() > 0">
             ${_conditionType_} a.deptCode not in
             <foreach collection="conditionParamRef.deptCodeNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -742,13 +766,13 @@
                 ${_conditionType_} a.source is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('sourceList')">
+        <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
             ${_conditionType_} a.source in
             <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('sourceNotList')">
+        <if test="conditionParamRef.containsKey('sourceNotList') and conditionParamRef.sourceNotList.size() > 0">
             ${_conditionType_} a.source not in
             <foreach collection="conditionParamRef.sourceNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -770,13 +794,13 @@
                 ${_conditionType_} a.eventTypeShow is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('eventTypeShowList')">
+        <if test="conditionParamRef.containsKey('eventTypeShowList') and conditionParamRef.eventTypeShowList.size() > 0">
             ${_conditionType_} a.eventTypeShow in
             <foreach collection="conditionParamRef.eventTypeShowList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('eventTypeShowNotList')">
+        <if test="conditionParamRef.containsKey('eventTypeShowNotList') and conditionParamRef.eventTypeShowNotList.size() > 0">
             ${_conditionType_} a.eventTypeShow not in
             <foreach collection="conditionParamRef.eventTypeShowNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -790,13 +814,13 @@
                 ${_conditionType_} a.viewsCount is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('viewsCountList')">
+        <if test="conditionParamRef.containsKey('viewsCountList') and conditionParamRef.viewsCountList.size() > 0">
             ${_conditionType_} a.viewsCount in
             <foreach collection="conditionParamRef.viewsCountList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('viewsCountNotList')">
+        <if test="conditionParamRef.containsKey('viewsCountNotList') and conditionParamRef.viewsCountNotList.size() > 0">
             ${_conditionType_} a.viewsCount not in
             <foreach collection="conditionParamRef.viewsCountNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -817,13 +841,13 @@
                 ${_conditionType_} a.isConvert is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('isConvertList')">
+        <if test="conditionParamRef.containsKey('isConvertList') and conditionParamRef.isConvertList.size() > 0">
             ${_conditionType_} a.isConvert in
             <foreach collection="conditionParamRef.isConvertList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('isConvertNotList')">
+        <if test="conditionParamRef.containsKey('isConvertNotList') and conditionParamRef.isConvertNotList.size() > 0">
             ${_conditionType_} a.isConvert not in
             <foreach collection="conditionParamRef.isConvertNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -845,18 +869,45 @@
                 ${_conditionType_} a.url is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('urlList')">
+        <if test="conditionParamRef.containsKey('urlList') and conditionParamRef.urlList.size() > 0">
             ${_conditionType_} a.url in
             <foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('urlNotList')">
+        <if test="conditionParamRef.containsKey('urlNotList') and conditionParamRef.urlNotList.size() > 0">
             ${_conditionType_} a.url not in
             <foreach collection="conditionParamRef.urlNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('hot')">
+            <if test="conditionParamRef.hot != null ">
+                ${_conditionType_} a.hot = #{${_conditionParam_}.hot}
+            </if>
+            <if test="conditionParamRef.hot == null">
+                ${_conditionType_} a.hot is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('hotList') and conditionParamRef.hotList.size() > 0">
+            ${_conditionType_} a.hot in
+            <foreach collection="conditionParamRef.hotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('hotNotList') and conditionParamRef.hotNotList.size() > 0">
+            ${_conditionType_} a.hot not in
+            <foreach collection="conditionParamRef.hotNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('hotStart') and conditionParamRef.hotStart != null">
+            ${_conditionType_} a.hot <![CDATA[ >= ]]> #{${_conditionParam_}.hotStart}
+        </if>
+        <if test="conditionParamRef.containsKey('hotEnd') and conditionParamRef.hotEnd != null">
+            ${_conditionType_} a.hot <![CDATA[ <= ]]> #{${_conditionParam_}.hotEnd}
+        </if>
+
         <if test="conditionParamRef.containsKey('createUserId')">
             <if test="conditionParamRef.createUserId != null ">
                 ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
@@ -865,13 +916,13 @@
                 ${_conditionType_} a.createUserId is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('createUserIdList')">
+        <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
             ${_conditionType_} a.createUserId in
             <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('createUserIdNotList')">
+        <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
             ${_conditionType_} a.createUserId not in
             <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -907,13 +958,13 @@
                 ${_conditionType_} a.updateUserId is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('updateUserIdList')">
+        <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
             ${_conditionType_} a.updateUserId in
             <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-            <if test="conditionParamRef.containsKey('updateUserIdNotList')">
+        <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
             ${_conditionType_} a.updateUserId not in
             <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -945,14 +996,168 @@
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
             order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                field(a.siteId,
+                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('siteMatterIdList') and conditionParamRef.siteMatterIdList.size() > 0">
+                field(a.siteMatterId,
+                <foreach collection="conditionParamRef.siteMatterIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdList') and conditionParamRef.matterIdList.size() > 0">
+                field(a.matterId,
+                <foreach collection="conditionParamRef.matterIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
+                field(a.deptId,
+                <foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
+                field(a.source,
+                <foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('viewsCountList') and conditionParamRef.viewsCountList.size() > 0">
+                field(a.viewsCount,
+                <foreach collection="conditionParamRef.viewsCountList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('isConvertList') and conditionParamRef.isConvertList.size() > 0">
+                field(a.isConvert,
+                <foreach collection="conditionParamRef.isConvertList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('hotList') and conditionParamRef.hotList.size() > 0">
+                field(a.hot,
+                <foreach collection="conditionParamRef.hotList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                field(a.createUserId,
+                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                field(a.updateUserId,
+                <foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     ${item.colName} ${item.sortKind}
+                    a.${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                field(a.siteId,
+                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('siteMatterIdList') and conditionParamRef.siteMatterIdList.size() > 0">
+                field(a.siteMatterId,
+                <foreach collection="conditionParamRef.siteMatterIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdList') and conditionParamRef.matterIdList.size() > 0">
+                field(a.matterId,
+                <foreach collection="conditionParamRef.matterIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
+                field(a.deptId,
+                <foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
+                field(a.source,
+                <foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('viewsCountList') and conditionParamRef.viewsCountList.size() > 0">
+                field(a.viewsCount,
+                <foreach collection="conditionParamRef.viewsCountList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('isConvertList') and conditionParamRef.isConvertList.size() > 0">
+                field(a.isConvert,
+                <foreach collection="conditionParamRef.isConvertList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('hotList') and conditionParamRef.hotList.size() > 0">
+                field(a.hot,
+                <foreach collection="conditionParamRef.hotList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                field(a.createUserId,
+                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                field(a.updateUserId,
+                <foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <if test="orderCol.containsKey('id')">
                     a.id
@@ -1029,6 +1234,11 @@
                     <if test='orderCol.url != null and "DESC".equalsIgnoreCase(orderCol.url)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('hot')">
+                    a.hot
+                    <if test='orderCol.hot != null and "DESC".equalsIgnoreCase(orderCol.hot)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('createUserId')">
                     a.createUserId
                     <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
@@ -1051,6 +1261,8 @@
                 </if>
             </trim>
         </if>
+
+
     </sql>
     <sql id="_group_by_">
         <if test="groupList != null and !groupList.isEmpty()">