Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncHolidayTaskImpl.java

@@ -86,8 +86,8 @@ public class SyncHolidayTaskImpl implements ITaskExcuteService {
                     holidayEntity.initAttrValue();
 
                     holidayEntity.setSiteId(1L);
-                    holidayEntity.setStartTime(DateUtil.parseDateTime(date));
-                    holidayEntity.setEndTime(DateUtil.parseDateTime(date));
+                    holidayEntity.setStartTime(DateUtil.parseDate(date));
+                    holidayEntity.setEndTime(DateUtil.parseDate(date));
                     holidayEntity.setYear(DateUtil.year(new Date()));
                     String name = "法定节假日(" + value1.get("name").toString() + ")";
 

portal-manager/db/add.sql

@@ -54,3 +54,11 @@ CREATE TABLE `mortals_xhx_user_model_collect` (
   `createTime` datetime DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户模块收藏';
+
+-- ----------------------------
+2023-10-10
+-- ----------------------------
+ALTER TABLE `mortals_xhx_user_model_collect`
+ADD COLUMN `siteId` bigint(20) DEFAULT NULL COMMENT '站点ID';
+
+UPDATE mortals_xhx_user_model_collect SET siteId=1;
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/user/model/UserModelCollectEntity.java

 package com.mortals.xhx.module.user.model;
-import java.util.List;
-import java.util.ArrayList;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mortals.framework.annotation.Excel;
-import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.user.model.vo.UserModelCollectVo;
 import lombok.Data;
 /**
-* 用户模块收藏实体对象
-*
-* @author zxfei
-* @date 2023-08-29
-*/
+ * 用户模块收藏实体对象
+ *
+ * @author zxfei
+ * @date 2023-10-10
+ */
 @Data
 public class UserModelCollectEntity extends UserModelCollectVo {
     private static final long serialVersionUID = 1L;
@@ -28,6 +23,10 @@ public class UserModelCollectEntity extends UserModelCollectVo {
      * 收藏模块
      */
     private String modelIds;
+    /**
+     * 站点id
+     */
+    private Long siteId;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -45,11 +44,9 @@ public class UserModelCollectEntity extends UserModelCollectVo {
     }
 
     public void initAttrValue(){
-
-            this.userId = -1L;
-
+        this.userId = null;
         this.realName = "";
-
         this.modelIds = "";
+        this.siteId = null;
     }
 }
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/user/model/UserModelCollectQuery.java

+package com.mortals.xhx.module.user.model;
+
+import java.util.List;
+/**
+ * 用户模块收藏查询对象
+ *
+ * @author zxfei
+ * @date 2023-10-10
+ */
+public class UserModelCollectQuery extends UserModelCollectEntity {
+    /** 开始 主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 开始 用户ID，主键，自增长 */
+    private Long userIdStart;
+
+    /** 结束 用户ID，主键，自增长 */
+    private Long userIdEnd;
+
+    /** 增加 用户ID，主键，自增长 */
+    private Long userIdIncrement;
+
+    /** 用户ID，主键，自增长列表 */
+    private List <Long> userIdList;
+
+    /** 用户ID，主键，自增长排除列表 */
+    private List <Long> userIdNotList;
+
+    /** 登录名 */
+    private List<String> realNameList;
+
+    /** 登录名排除列表 */
+    private List <String> realNameNotList;
+    /** 收藏模块 */
+    private List<String> modelIdsList;
+
+    /** 收藏模块排除列表 */
+    private List <String> modelIdsNotList;
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 站点id */
+    private Long siteIdStart;
+
+    /** 结束 站点id */
+    private Long siteIdEnd;
+
+    /** 增加 站点id */
+    private Long siteIdIncrement;
+
+    /** 站点id列表 */
+    private List <Long> siteIdList;
+
+    /** 站点id排除列表 */
+    private List <Long> siteIdNotList;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<UserModelCollectQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<UserModelCollectQuery> andConditionList;
+
+    public UserModelCollectQuery(){}
+
+    /**
+     * 获取 开始 主键，自增长
+     * @return idStart
+     */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+     * 设置 开始 主键，自增长
+     * @param idStart
+     */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+     * 获取 结束 主键，自增长
+     * @return $idEnd
+     */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+     * 设置 结束 主键，自增长
+     * @param idEnd
+     */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+     * 获取 增加 主键，自增长
+     * @return idIncrement
+     */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+     * 设置 增加 主键，自增长
+     * @param idIncrement
+     */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+     * 获取 主键，自增长
+     * @return idList
+     */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+     * 设置 主键，自增长
+     * @param idList
+     */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+     * 获取 主键，自增长
+     * @return idNotList
+     */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+     * 设置 主键，自增长
+     * @param idNotList
+     */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+     * 获取 开始 用户ID，主键，自增长
+     * @return userIdStart
+     */
+    public Long getUserIdStart(){
+        return this.userIdStart;
+    }
+
+    /**
+     * 设置 开始 用户ID，主键，自增长
+     * @param userIdStart
+     */
+    public void setUserIdStart(Long userIdStart){
+        this.userIdStart = userIdStart;
+    }
+
+    /**
+     * 获取 结束 用户ID，主键，自增长
+     * @return $userIdEnd
+     */
+    public Long getUserIdEnd(){
+        return this.userIdEnd;
+    }
+
+    /**
+     * 设置 结束 用户ID，主键，自增长
+     * @param userIdEnd
+     */
+    public void setUserIdEnd(Long userIdEnd){
+        this.userIdEnd = userIdEnd;
+    }
+
+    /**
+     * 获取 增加 用户ID，主键，自增长
+     * @return userIdIncrement
+     */
+    public Long getUserIdIncrement(){
+        return this.userIdIncrement;
+    }
+
+    /**
+     * 设置 增加 用户ID，主键，自增长
+     * @param userIdIncrement
+     */
+    public void setUserIdIncrement(Long userIdIncrement){
+        this.userIdIncrement = userIdIncrement;
+    }
+
+    /**
+     * 获取 用户ID，主键，自增长
+     * @return userIdList
+     */
+    public List<Long> getUserIdList(){
+        return this.userIdList;
+    }
+
+    /**
+     * 设置 用户ID，主键，自增长
+     * @param userIdList
+     */
+    public void setUserIdList(List<Long> userIdList){
+        this.userIdList = userIdList;
+    }
+
+    /**
+     * 获取 用户ID，主键，自增长
+     * @return userIdNotList
+     */
+    public List<Long> getUserIdNotList(){
+        return this.userIdNotList;
+    }
+
+    /**
+     * 设置 用户ID，主键，自增长
+     * @param userIdNotList
+     */
+    public void setUserIdNotList(List<Long> userIdNotList){
+        this.userIdNotList = userIdNotList;
+    }
+
+
+    /**
+     * 获取 登录名
+     * @return realNameList
+     */
+    public List<String> getRealNameList(){
+        return this.realNameList;
+    }
+
+    /**
+     * 设置 登录名
+     * @param realNameList
+     */
+    public void setRealNameList(List<String> realNameList){
+        this.realNameList = realNameList;
+    }
+
+    /**
+     * 获取 登录名
+     * @return realNameNotList
+     */
+    public List<String> getRealNameNotList(){
+        return this.realNameNotList;
+    }
+
+    /**
+     * 设置 登录名
+     * @param realNameNotList
+     */
+    public void setRealNameNotList(List<String> realNameNotList){
+        this.realNameNotList = realNameNotList;
+    }
+
+    /**
+     * 获取 收藏模块
+     * @return modelIdsList
+     */
+    public List<String> getModelIdsList(){
+        return this.modelIdsList;
+    }
+
+    /**
+     * 设置 收藏模块
+     * @param modelIdsList
+     */
+    public void setModelIdsList(List<String> modelIdsList){
+        this.modelIdsList = modelIdsList;
+    }
+
+    /**
+     * 获取 收藏模块
+     * @return modelIdsNotList
+     */
+    public List<String> getModelIdsNotList(){
+        return this.modelIdsNotList;
+    }
+
+    /**
+     * 设置 收藏模块
+     * @param modelIdsNotList
+     */
+    public void setModelIdsNotList(List<String> modelIdsNotList){
+        this.modelIdsNotList = modelIdsNotList;
+    }
+
+    /**
+     * 获取 开始 创建时间
+     * @return createTimeStart
+     */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+     * 设置 开始 创建时间
+     * @param createTimeStart
+     */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+     * 获取 结束 创建时间
+     * @return createTimeEnd
+     */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+     * 设置 结束 创建时间
+     * @param createTimeEnd
+     */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+     * 获取 开始 站点id
+     * @return siteIdStart
+     */
+    public Long getSiteIdStart(){
+        return this.siteIdStart;
+    }
+
+    /**
+     * 设置 开始 站点id
+     * @param siteIdStart
+     */
+    public void setSiteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+    }
+
+    /**
+     * 获取 结束 站点id
+     * @return $siteIdEnd
+     */
+    public Long getSiteIdEnd(){
+        return this.siteIdEnd;
+    }
+
+    /**
+     * 设置 结束 站点id
+     * @param siteIdEnd
+     */
+    public void setSiteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+    }
+
+    /**
+     * 获取 增加 站点id
+     * @return siteIdIncrement
+     */
+    public Long getSiteIdIncrement(){
+        return this.siteIdIncrement;
+    }
+
+    /**
+     * 设置 增加 站点id
+     * @param siteIdIncrement
+     */
+    public void setSiteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+    }
+
+    /**
+     * 获取 站点id
+     * @return siteIdList
+     */
+    public List<Long> getSiteIdList(){
+        return this.siteIdList;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdList
+     */
+    public void setSiteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+    }
+
+    /**
+     * 获取 站点id
+     * @return siteIdNotList
+     */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdNotList
+     */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
+    /**
+     * 设置  主键，自增长
+     * @param id
+     */
+    public UserModelCollectQuery id(Long id){
+        setId(id);
+        return this;
+    }
+
+    /**
+     * 设置 开始 主键，自增长
+     * @param idStart
+     */
+    public UserModelCollectQuery idStart(Long idStart){
+        this.idStart = idStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 主键，自增长
+     * @param idEnd
+     */
+    public UserModelCollectQuery idEnd(Long idEnd){
+        this.idEnd = idEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 主键，自增长
+     * @param idIncrement
+     */
+    public UserModelCollectQuery idIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 主键，自增长
+     * @param idList
+     */
+    public UserModelCollectQuery idList(List<Long> idList){
+        this.idList = idList;
+        return this;
+    }
+
+    /**
+     * 设置 主键，自增长
+     * @param idNotList
+     */
+    public UserModelCollectQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+    }
+
+    /**
+     * 设置  用户ID，主键，自增长
+     * @param userId
+     */
+    public UserModelCollectQuery userId(Long userId){
+        setUserId(userId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 用户ID，主键，自增长
+     * @param userIdStart
+     */
+    public UserModelCollectQuery userIdStart(Long userIdStart){
+        this.userIdStart = userIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 用户ID，主键，自增长
+     * @param userIdEnd
+     */
+    public UserModelCollectQuery userIdEnd(Long userIdEnd){
+        this.userIdEnd = userIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 用户ID，主键，自增长
+     * @param userIdIncrement
+     */
+    public UserModelCollectQuery userIdIncrement(Long userIdIncrement){
+        this.userIdIncrement = userIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 用户ID，主键，自增长
+     * @param userIdList
+     */
+    public UserModelCollectQuery userIdList(List<Long> userIdList){
+        this.userIdList = userIdList;
+        return this;
+    }
+
+    /**
+     * 设置 用户ID，主键，自增长
+     * @param userIdNotList
+     */
+    public UserModelCollectQuery userIdNotList(List<Long> userIdNotList){
+        this.userIdNotList = userIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 登录名
+     * @param realName
+     */
+    public UserModelCollectQuery realName(String realName){
+        setRealName(realName);
+        return this;
+    }
+
+    /**
+     * 设置 登录名
+     * @param realNameList
+     */
+    public UserModelCollectQuery realNameList(List<String> realNameList){
+        this.realNameList = realNameList;
+        return this;
+    }
+
+
+    /**
+     * 设置 收藏模块
+     * @param modelIds
+     */
+    public UserModelCollectQuery modelIds(String modelIds){
+        setModelIds(modelIds);
+        return this;
+    }
+
+    /**
+     * 设置 收藏模块
+     * @param modelIdsList
+     */
+    public UserModelCollectQuery modelIdsList(List<String> modelIdsList){
+        this.modelIdsList = modelIdsList;
+        return this;
+    }
+
+
+    /**
+     * 设置  站点id
+     * @param siteId
+     */
+    public UserModelCollectQuery siteId(Long siteId){
+        setSiteId(siteId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 站点id
+     * @param siteIdStart
+     */
+    public UserModelCollectQuery siteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 站点id
+     * @param siteIdEnd
+     */
+    public UserModelCollectQuery siteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 站点id
+     * @param siteIdIncrement
+     */
+    public UserModelCollectQuery siteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdList
+     */
+    public UserModelCollectQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+        return this;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdNotList
+     */
+    public UserModelCollectQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+    }
+
+    /**
+     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @return orConditionList
+     */
+    public List<UserModelCollectQuery> getOrConditionList(){
+        return this.orConditionList;
+    }
+
+    /**
+     * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @param orConditionList
+     */
+    public void setOrConditionList(List<UserModelCollectQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+     * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @return andConditionList
+     */
+    public List<UserModelCollectQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+     * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @param andConditionList
+     */
+    public void setAndConditionList(List<UserModelCollectQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserModelCollectController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.RepeatSubmit;
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.IUser;
@@ -54,20 +55,27 @@ public class UserModelCollectController extends BaseCRUDJsonBodyMappingControlle
 
 
     @PostMapping({"get"})
-    public String getCollect() {
+    @UnAuth
+    public String getCollect(@RequestBody UserModelCollectEntity query) {
+
         Map<String, Object> model = new HashMap();
         JSONObject ret = new JSONObject();
         String busiDesc = "查看" + this.getModuleDesc();
         Context context = this.getContext();
         model.put("data", Collections.emptyList());
         try {
-            UserModelCollectEntity  query = new UserModelCollectEntity();
-            query.setUserId(this.getCurUser().getId());
-            UserModelCollectEntity entity = this.service.selectOne(query);
+            if(query.getSiteId()==null){
+                throw new AppException("站点ID不能为空");
+            }
+            UserModelCollectEntity  temp = new UserModelCollectEntity();
+            temp.setUserId(this.getCurUser().getId());
+            temp.setSiteId(query.getSiteId());
+            UserModelCollectEntity entity = this.service.selectOne(temp);
             if (entity == null) {
                 entity = new UserModelCollectEntity();
                 entity.setUserId(this.getCurUser().getId());
                 entity.setRealName(this.getCurUser().getRealName());
+                entity.setSiteId(query.getSiteId());
                 entity.setModelIds("");
             }else {
                 if(StringUtils.isNotEmpty(entity.getModelIds())){
@@ -117,6 +125,7 @@ public class UserModelCollectController extends BaseCRUDJsonBodyMappingControlle
     @Override
     @PostMapping({"save"})
     @RepeatSubmit
+    @UnAuth
     public String save(@RequestBody UserModelCollectEntity entity) {
         Map<String, Object> model = new HashMap();
         Context context = this.getContext();
@@ -126,8 +135,12 @@ public class UserModelCollectController extends BaseCRUDJsonBodyMappingControlle
             return this.createFailJsonResp("请选择要收藏的模块");
         }
         try {
+            if(entity.getSiteId()==null){
+                throw new AppException("站点ID不能为空");
+            }
             UserModelCollectEntity  query = new UserModelCollectEntity();
             query.setUserId(this.getCurUser().getId());
+            query.setSiteId(query.getSiteId());
             UserModelCollectEntity temp = this.service.selectOne(query);
             if (temp == null) {
                 Class<UserModelCollectEntity> tClass = ReflectUtils.getClassGenricType(this.getClass(), 1);

portal-manager/src/main/resources/sqlmap/module/user/UserModelCollectMapper.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.user.dao.ibatis.UserModelCollectDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -10,6 +10,7 @@
         <result property="realName" column="realName" />
         <result property="modelIds" column="modelIds" />
         <result property="createTime" column="createTime" />
+        <result property="siteId" column="siteId" />
 
     </resultMap>
 
@@ -32,23 +33,26 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
                 a.createTime,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                a.siteId,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="UserModelCollectEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_user_model_collect
-        (userId,realName,modelIds,createTime)
+        (userId,realName,modelIds,createTime,siteId)
         VALUES
-        (#{userId},#{realName},#{modelIds},#{createTime})
+        (#{userId},#{realName},#{modelIds},#{createTime},#{siteId})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_user_model_collect
-        (userId,realName,modelIds,createTime)
+        (userId,realName,modelIds,createTime,siteId)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.userId},#{item.realName},#{item.modelIds},#{item.createTime})
+            (#{item.userId},#{item.realName},#{item.modelIds},#{item.createTime},#{item.siteId})
         </foreach>
     </insert>
 
@@ -73,6 +77,12 @@
             <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
                 a.createTime=#{data.createTime},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.siteId=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -118,6 +128,18 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                            when a.id=#{item.id} then #{item.siteId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -345,10 +367,58 @@
         <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
             ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
         </if>
+        <if test="conditionParamRef.containsKey('siteId')">
+            <if test="conditionParamRef.siteId != null ">
+                ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
+            </if>
+            <if test="conditionParamRef.siteId == null">
+                ${_conditionType_} a.siteId is null
+            </if>
+        </if>
+        <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') and conditionParamRef.siteIdNotList.size() > 0">
+            ${_conditionType_} a.siteId not in
+            <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+            ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+            ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+        </if>
+
     </sql>
     <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('userIdList') and conditionParamRef.userIdList.size() > 0">
+                field(a.userId,
+                <foreach collection="conditionParamRef.userIdList" 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>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
                     ${item.colName} ${item.sortKind}
@@ -357,6 +427,27 @@
         </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('userIdList') and conditionParamRef.userIdList.size() > 0">
+                field(a.userId,
+                <foreach collection="conditionParamRef.userIdList" 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>
             <trim suffixOverrides=","  suffix="">
                 <if test="orderCol.containsKey('id')">
                     a.id
@@ -383,8 +474,15 @@
                     <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('siteId')">
+                    a.siteId
+                    <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
+
+
     </sql>
     <sql id="_group_by_">
         <if test="groupList != null and !groupList.isEmpty()">