Merge remote-tracking branch 'origin/master'

portal-manager/doc/api.md

@@ -3181,7 +3181,7 @@ data|object|数据对象
  data|array|结果集列表|数组
   id|Long|主键,自增长
   name|String|应用名称
-  code|String|应用编码
+  imgPath|String|图标地址
   url|String|连接地址
   status|Integer|状态，0暂未开通，1已开通
   sortNum|Integer|排序号
@@ -3213,7 +3213,7 @@ dict|object|字典对象
                 "siteId": null,
                 "idList": null,
                 "name": "基础设置",
-                "code": "testCode",
+                "imgPath": "testCode",
                 "url": "testUrl",
                 "status": 1,
                 "sortNum": 0,
@@ -3231,7 +3231,7 @@ dict|object|字典对象
                 "siteId": null,
                 "idList": null,
                 "name": "预约系统",
-                "code": "testCode",
+                "imgPath": "testCode",
                 "url": "testUrl",
                 "status": 0,
                 "sortNum": 0,
@@ -3249,7 +3249,7 @@ dict|object|字典对象
                 "siteId": null,
                 "idList": null,
                 "name": "排号系统",
-                "code": "testCode",
+                "imgPath": "testCode",
                 "url": "testUrl",
                 "status": 1,
                 "sortNum": 0,
@@ -3267,7 +3267,7 @@ dict|object|字典对象
                 "siteId": null,
                 "idList": null,
                 "name": "评价系统",
-                "code": "testCode",
+                "imgPath": "testCode",
                 "url": "testUrl",
                 "status": 0,
                 "sortNum": 0,

portal-manager/src/main/java/com/mortals/xhx/module/apps/model/AppsEntity.java

@@ -7,160 +7,160 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.apps.model.vo.AppsVo;
 /**
-* 系统应用列实体对象
-*
-* @author zxfei
-* @date 2022-06-22
-*/
+ * 系统应用列实体对象
+ *
+ * @author zxfei
+ * @date 2022-06-23
+ */
 
 public class AppsEntity extends AppsVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 应用名称
-    */
+     * 应用名称
+     */
     private String name;
     /**
-    * 应用编码
-    */
-    private String code;
+     * 图标
+     */
+    private String imgPath;
     /**
-    * 连接地址
-    */
+     * 连接地址
+     */
     private String url;
     /**
-    * 状态，0暂未开通，1已开通
-    */
+     * 状态，0暂未开通，1已开通
+     */
     private Integer status;
     /**
-    * 排序号
-    */
+     * 排序号
+     */
     private Integer sortNum;
     /**
-    * 描述
-    */
+     * 描述
+     */
     private String remark;
     /**
-    * 创建用户名称
-    */
+     * 创建用户名称
+     */
     private String createUserName;
     /**
-    * 更新用户名称
-    */
+     * 更新用户名称
+     */
     private String updateUserName;
 
 
 
     public AppsEntity(){}
     /**
-    * 获取 应用名称
-    * @return String
-    */
+     * 获取 应用名称
+     * @return String
+     */
     public String getName(){
         return name;
     }
     /**
-    * 设置 应用名称
-    * @param name
-    */
+     * 设置 应用名称
+     * @param name
+     */
     public void setName(String name){
         this.name = name;
     }
     /**
-    * 获取 应用编码
-    * @return String
-    */
-    public String getCode(){
-        return code;
+     * 获取 图标
+     * @return String
+     */
+    public String getImgPath(){
+        return imgPath;
     }
     /**
-    * 设置 应用编码
-    * @param code
-    */
-    public void setCode(String code){
-        this.code = code;
+     * 设置 图标
+     * @param imgPath
+     */
+    public void setImgPath(String imgPath){
+        this.imgPath = imgPath;
     }
     /**
-    * 获取 连接地址
-    * @return String
-    */
+     * 获取 连接地址
+     * @return String
+     */
     public String getUrl(){
         return url;
     }
     /**
-    * 设置 连接地址
-    * @param url
-    */
+     * 设置 连接地址
+     * @param url
+     */
     public void setUrl(String url){
         this.url = url;
     }
     /**
-    * 获取 状态，0暂未开通，1已开通
-    * @return Integer
-    */
+     * 获取 状态，0暂未开通，1已开通
+     * @return Integer
+     */
     public Integer getStatus(){
         return status;
     }
     /**
-    * 设置 状态，0暂未开通，1已开通
-    * @param status
-    */
+     * 设置 状态，0暂未开通，1已开通
+     * @param status
+     */
     public void setStatus(Integer status){
         this.status = status;
     }
     /**
-    * 获取 排序号
-    * @return Integer
-    */
+     * 获取 排序号
+     * @return Integer
+     */
     public Integer getSortNum(){
         return sortNum;
     }
     /**
-    * 设置 排序号
-    * @param sortNum
-    */
+     * 设置 排序号
+     * @param sortNum
+     */
     public void setSortNum(Integer sortNum){
         this.sortNum = sortNum;
     }
     /**
-    * 获取 描述
-    * @return String
-    */
+     * 获取 描述
+     * @return String
+     */
     public String getRemark(){
         return remark;
     }
     /**
-    * 设置 描述
-    * @param remark
-    */
+     * 设置 描述
+     * @param remark
+     */
     public void setRemark(String remark){
         this.remark = remark;
     }
     /**
-    * 获取 创建用户名称
-    * @return String
-    */
+     * 获取 创建用户名称
+     * @return String
+     */
     public String getCreateUserName(){
         return createUserName;
     }
     /**
-    * 设置 创建用户名称
-    * @param createUserName
-    */
+     * 设置 创建用户名称
+     * @param createUserName
+     */
     public void setCreateUserName(String createUserName){
         this.createUserName = createUserName;
     }
     /**
-    * 获取 更新用户名称
-    * @return String
-    */
+     * 获取 更新用户名称
+     * @return String
+     */
     public String getUpdateUserName(){
         return updateUserName;
     }
     /**
-    * 设置 更新用户名称
-    * @param updateUserName
-    */
+     * 设置 更新用户名称
+     * @param updateUserName
+     */
     public void setUpdateUserName(String updateUserName){
         this.updateUserName = updateUserName;
     }
@@ -170,7 +170,7 @@ public class AppsEntity extends AppsVo {
 
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -178,7 +178,7 @@ public class AppsEntity extends AppsVo {
         if (obj instanceof AppsEntity) {
             AppsEntity tmp = (AppsEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
@@ -187,7 +187,7 @@ public class AppsEntity extends AppsVo {
     public String toString(){
         StringBuilder sb = new StringBuilder("");
         sb.append(",name:").append(getName());
-        sb.append(",code:").append(getCode());
+        sb.append(",imgPath:").append(getImgPath());
         sb.append(",url:").append(getUrl());
         sb.append(",status:").append(getStatus());
         sb.append(",sortNum:").append(getSortNum());
@@ -199,20 +199,20 @@ public class AppsEntity extends AppsVo {
 
     public void initAttrValue(){
 
-            this.name = "";
+        this.name = "";
 
-            this.code = "";
+        this.imgPath = "";
 
-            this.url = "";
+        this.url = "";
 
-            this.status = 0;
+        this.status = 0;
 
-            this.sortNum = 0;
+        this.sortNum = 0;
 
-            this.remark = "";
+        this.remark = "";
 
-            this.createUserName = "";
+        this.createUserName = "";
 
-            this.updateUserName = "";
+        this.updateUserName = "";
     }
 }
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/apps/model/AppsQuery.java

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.apps.model;
 import java.util.List;
 import com.mortals.xhx.module.apps.model.AppsEntity;
 /**
-* 系统应用列查询对象
-*
-* @author zxfei
-* @date 2022-06-22
-*/
+ * 系统应用列查询对象
+ *
+ * @author zxfei
+ * @date 2022-06-23
+ */
 public class AppsQuery extends AppsEntity {
     /** 开始 主键,自增长 */
     private Long idStart;
@@ -24,8 +24,8 @@ public class AppsQuery extends AppsEntity {
     /** 应用名称 */
     private List<String> nameList;
 
-    /** 应用编码 */
-    private List<String> codeList;
+    /** 图标 */
+    private List<String> imgPathList;
 
     /** 连接地址 */
     private List<String> urlList;
@@ -108,848 +108,848 @@ public class AppsQuery extends AppsEntity {
     public AppsQuery(){}
 
     /**
-    * 获取 开始 主键,自增长
-    * @return idStart
-    */
+     * 获取 开始 主键,自增长
+     * @return idStart
+     */
     public Long getIdStart(){
         return this.idStart;
     }
 
     /**
-    * 设置 开始 主键,自增长
-    * @param idStart
-    */
+     * 设置 开始 主键,自增长
+     * @param idStart
+     */
     public void setIdStart(Long idStart){
         this.idStart = idStart;
     }
 
     /**
-    * 获取 结束 主键,自增长
-    * @return $idEnd
-    */
+     * 获取 结束 主键,自增长
+     * @return $idEnd
+     */
     public Long getIdEnd(){
         return this.idEnd;
     }
 
     /**
-    * 设置 结束 主键,自增长
-    * @param idEnd
-    */
+     * 设置 结束 主键,自增长
+     * @param idEnd
+     */
     public void setIdEnd(Long idEnd){
         this.idEnd = idEnd;
     }
 
     /**
-    * 获取 增加 主键,自增长
-    * @return idIncrement
-    */
+     * 获取 增加 主键,自增长
+     * @return idIncrement
+     */
     public Long getIdIncrement(){
         return this.idIncrement;
     }
 
     /**
-    * 设置 增加 主键,自增长
-    * @param idIncrement
-    */
+     * 设置 增加 主键,自增长
+     * @param idIncrement
+     */
     public void setIdIncrement(Long idIncrement){
         this.idIncrement = idIncrement;
     }
 
     /**
-    * 获取 主键,自增长
-    * @return idList
-    */
+     * 获取 主键,自增长
+     * @return idList
+     */
     public List<Long> getIdList(){
         return this.idList;
     }
 
     /**
-    * 设置 主键,自增长
-    * @param idList
-    */
+     * 设置 主键,自增长
+     * @param idList
+     */
     public void setIdList(List<Long> idList){
         this.idList = idList;
     }
 
     /**
-    * 获取 应用名称
-    * @return nameList
-    */
+     * 获取 应用名称
+     * @return nameList
+     */
     public List<String> getNameList(){
         return this.nameList;
     }
 
     /**
-    * 设置 应用名称
-    * @param nameList
-    */
+     * 设置 应用名称
+     * @param nameList
+     */
     public void setNameList(List<String> nameList){
         this.nameList = nameList;
     }
     /**
-    * 获取 应用编码
-    * @return codeList
-    */
-    public List<String> getCodeList(){
-        return this.codeList;
+     * 获取 图标
+     * @return imgPathList
+     */
+    public List<String> getImgPathList(){
+        return this.imgPathList;
     }
 
     /**
-    * 设置 应用编码
-    * @param codeList
-    */
-    public void setCodeList(List<String> codeList){
-        this.codeList = codeList;
+     * 设置 图标
+     * @param imgPathList
+     */
+    public void setImgPathList(List<String> imgPathList){
+        this.imgPathList = imgPathList;
     }
     /**
-    * 获取 连接地址
-    * @return urlList
-    */
+     * 获取 连接地址
+     * @return urlList
+     */
     public List<String> getUrlList(){
         return this.urlList;
     }
 
     /**
-    * 设置 连接地址
-    * @param urlList
-    */
+     * 设置 连接地址
+     * @param urlList
+     */
     public void setUrlList(List<String> urlList){
         this.urlList = urlList;
     }
     /**
-    * 获取 开始 状态，0暂未开通，1已开通
-    * @return statusStart
-    */
+     * 获取 开始 状态，0暂未开通，1已开通
+     * @return statusStart
+     */
     public Integer getStatusStart(){
         return this.statusStart;
     }
 
     /**
-    * 设置 开始 状态，0暂未开通，1已开通
-    * @param statusStart
-    */
+     * 设置 开始 状态，0暂未开通，1已开通
+     * @param statusStart
+     */
     public void setStatusStart(Integer statusStart){
         this.statusStart = statusStart;
     }
 
     /**
-    * 获取 结束 状态，0暂未开通，1已开通
-    * @return $statusEnd
-    */
+     * 获取 结束 状态，0暂未开通，1已开通
+     * @return $statusEnd
+     */
     public Integer getStatusEnd(){
         return this.statusEnd;
     }
 
     /**
-    * 设置 结束 状态，0暂未开通，1已开通
-    * @param statusEnd
-    */
+     * 设置 结束 状态，0暂未开通，1已开通
+     * @param statusEnd
+     */
     public void setStatusEnd(Integer statusEnd){
         this.statusEnd = statusEnd;
     }
 
     /**
-    * 获取 增加 状态，0暂未开通，1已开通
-    * @return statusIncrement
-    */
+     * 获取 增加 状态，0暂未开通，1已开通
+     * @return statusIncrement
+     */
     public Integer getStatusIncrement(){
         return this.statusIncrement;
     }
 
     /**
-    * 设置 增加 状态，0暂未开通，1已开通
-    * @param statusIncrement
-    */
+     * 设置 增加 状态，0暂未开通，1已开通
+     * @param statusIncrement
+     */
     public void setStatusIncrement(Integer statusIncrement){
         this.statusIncrement = statusIncrement;
     }
 
     /**
-    * 获取 状态，0暂未开通，1已开通
-    * @return statusList
-    */
+     * 获取 状态，0暂未开通，1已开通
+     * @return statusList
+     */
     public List<Integer> getStatusList(){
         return this.statusList;
     }
 
     /**
-    * 设置 状态，0暂未开通，1已开通
-    * @param statusList
-    */
+     * 设置 状态，0暂未开通，1已开通
+     * @param statusList
+     */
     public void setStatusList(List<Integer> statusList){
         this.statusList = statusList;
     }
 
     /**
-    * 获取 开始 排序号
-    * @return sortNumStart
-    */
+     * 获取 开始 排序号
+     * @return sortNumStart
+     */
     public Integer getSortNumStart(){
         return this.sortNumStart;
     }
 
     /**
-    * 设置 开始 排序号
-    * @param sortNumStart
-    */
+     * 设置 开始 排序号
+     * @param sortNumStart
+     */
     public void setSortNumStart(Integer sortNumStart){
         this.sortNumStart = sortNumStart;
     }
 
     /**
-    * 获取 结束 排序号
-    * @return $sortNumEnd
-    */
+     * 获取 结束 排序号
+     * @return $sortNumEnd
+     */
     public Integer getSortNumEnd(){
         return this.sortNumEnd;
     }
 
     /**
-    * 设置 结束 排序号
-    * @param sortNumEnd
-    */
+     * 设置 结束 排序号
+     * @param sortNumEnd
+     */
     public void setSortNumEnd(Integer sortNumEnd){
         this.sortNumEnd = sortNumEnd;
     }
 
     /**
-    * 获取 增加 排序号
-    * @return sortNumIncrement
-    */
+     * 获取 增加 排序号
+     * @return sortNumIncrement
+     */
     public Integer getSortNumIncrement(){
         return this.sortNumIncrement;
     }
 
     /**
-    * 设置 增加 排序号
-    * @param sortNumIncrement
-    */
+     * 设置 增加 排序号
+     * @param sortNumIncrement
+     */
     public void setSortNumIncrement(Integer sortNumIncrement){
         this.sortNumIncrement = sortNumIncrement;
     }
 
     /**
-    * 获取 排序号
-    * @return sortNumList
-    */
+     * 获取 排序号
+     * @return sortNumList
+     */
     public List<Integer> getSortNumList(){
         return this.sortNumList;
     }
 
     /**
-    * 设置 排序号
-    * @param sortNumList
-    */
+     * 设置 排序号
+     * @param sortNumList
+     */
     public void setSortNumList(List<Integer> sortNumList){
         this.sortNumList = sortNumList;
     }
 
     /**
-    * 获取 描述
-    * @return remarkList
-    */
+     * 获取 描述
+     * @return remarkList
+     */
     public List<String> getRemarkList(){
         return this.remarkList;
     }
 
     /**
-    * 设置 描述
-    * @param remarkList
-    */
+     * 设置 描述
+     * @param remarkList
+     */
     public void setRemarkList(List<String> remarkList){
         this.remarkList = remarkList;
     }
     /**
-    * 获取 开始 创建时间
-    * @return createTimeStart
-    */
+     * 获取 开始 创建时间
+     * @return createTimeStart
+     */
     public String getCreateTimeStart(){
         return this.createTimeStart;
     }
 
     /**
-    * 设置 开始 创建时间
-    * @param createTimeStart
-    */
+     * 设置 开始 创建时间
+     * @param createTimeStart
+     */
     public void setCreateTimeStart(String createTimeStart){
         this.createTimeStart = createTimeStart;
     }
 
     /**
-    * 获取 结束 创建时间
-    * @return createTimeEnd
-    */
+     * 获取 结束 创建时间
+     * @return createTimeEnd
+     */
     public String getCreateTimeEnd(){
         return this.createTimeEnd;
     }
 
     /**
-    * 设置 结束 创建时间
-    * @param createTimeEnd
-    */
+     * 设置 结束 创建时间
+     * @param createTimeEnd
+     */
     public void setCreateTimeEnd(String createTimeEnd){
         this.createTimeEnd = createTimeEnd;
     }
 
     /**
-    * 获取 开始 更新时间
-    * @return updateTimeStart
-    */
+     * 获取 开始 更新时间
+     * @return updateTimeStart
+     */
     public String getUpdateTimeStart(){
         return this.updateTimeStart;
     }
 
     /**
-    * 设置 开始 更新时间
-    * @param updateTimeStart
-    */
+     * 设置 开始 更新时间
+     * @param updateTimeStart
+     */
     public void setUpdateTimeStart(String updateTimeStart){
         this.updateTimeStart = updateTimeStart;
     }
 
     /**
-    * 获取 结束 更新时间
-    * @return updateTimeEnd
-    */
+     * 获取 结束 更新时间
+     * @return updateTimeEnd
+     */
     public String getUpdateTimeEnd(){
         return this.updateTimeEnd;
     }
 
     /**
-    * 设置 结束 更新时间
-    * @param updateTimeEnd
-    */
+     * 设置 结束 更新时间
+     * @param updateTimeEnd
+     */
     public void setUpdateTimeEnd(String updateTimeEnd){
         this.updateTimeEnd = updateTimeEnd;
     }
 
     /**
-    * 获取 开始 创建用户ID
-    * @return createUserIdStart
-    */
+     * 获取 开始 创建用户ID
+     * @return createUserIdStart
+     */
     public Long getCreateUserIdStart(){
         return this.createUserIdStart;
     }
 
     /**
-    * 设置 开始 创建用户ID
-    * @param createUserIdStart
-    */
+     * 设置 开始 创建用户ID
+     * @param createUserIdStart
+     */
     public void setCreateUserIdStart(Long createUserIdStart){
         this.createUserIdStart = createUserIdStart;
     }
 
     /**
-    * 获取 结束 创建用户ID
-    * @return $createUserIdEnd
-    */
+     * 获取 结束 创建用户ID
+     * @return $createUserIdEnd
+     */
     public Long getCreateUserIdEnd(){
         return this.createUserIdEnd;
     }
 
     /**
-    * 设置 结束 创建用户ID
-    * @param createUserIdEnd
-    */
+     * 设置 结束 创建用户ID
+     * @param createUserIdEnd
+     */
     public void setCreateUserIdEnd(Long createUserIdEnd){
         this.createUserIdEnd = createUserIdEnd;
     }
 
     /**
-    * 获取 增加 创建用户ID
-    * @return createUserIdIncrement
-    */
+     * 获取 增加 创建用户ID
+     * @return createUserIdIncrement
+     */
     public Long getCreateUserIdIncrement(){
         return this.createUserIdIncrement;
     }
 
     /**
-    * 设置 增加 创建用户ID
-    * @param createUserIdIncrement
-    */
+     * 设置 增加 创建用户ID
+     * @param createUserIdIncrement
+     */
     public void setCreateUserIdIncrement(Long createUserIdIncrement){
         this.createUserIdIncrement = createUserIdIncrement;
     }
 
     /**
-    * 获取 创建用户ID
-    * @return createUserIdList
-    */
+     * 获取 创建用户ID
+     * @return createUserIdList
+     */
     public List<Long> getCreateUserIdList(){
         return this.createUserIdList;
     }
 
     /**
-    * 设置 创建用户ID
-    * @param createUserIdList
-    */
+     * 设置 创建用户ID
+     * @param createUserIdList
+     */
     public void setCreateUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
     }
 
     /**
-    * 获取 创建用户名称
-    * @return createUserNameList
-    */
+     * 获取 创建用户名称
+     * @return createUserNameList
+     */
     public List<String> getCreateUserNameList(){
         return this.createUserNameList;
     }
 
     /**
-    * 设置 创建用户名称
-    * @param createUserNameList
-    */
+     * 设置 创建用户名称
+     * @param createUserNameList
+     */
     public void setCreateUserNameList(List<String> createUserNameList){
         this.createUserNameList = createUserNameList;
     }
     /**
-    * 获取 开始 更新用户
-    * @return updateUserIdStart
-    */
+     * 获取 开始 更新用户
+     * @return updateUserIdStart
+     */
     public Long getUpdateUserIdStart(){
         return this.updateUserIdStart;
     }
 
     /**
-    * 设置 开始 更新用户
-    * @param updateUserIdStart
-    */
+     * 设置 开始 更新用户
+     * @param updateUserIdStart
+     */
     public void setUpdateUserIdStart(Long updateUserIdStart){
         this.updateUserIdStart = updateUserIdStart;
     }
 
     /**
-    * 获取 结束 更新用户
-    * @return $updateUserIdEnd
-    */
+     * 获取 结束 更新用户
+     * @return $updateUserIdEnd
+     */
     public Long getUpdateUserIdEnd(){
         return this.updateUserIdEnd;
     }
 
     /**
-    * 设置 结束 更新用户
-    * @param updateUserIdEnd
-    */
+     * 设置 结束 更新用户
+     * @param updateUserIdEnd
+     */
     public void setUpdateUserIdEnd(Long updateUserIdEnd){
         this.updateUserIdEnd = updateUserIdEnd;
     }
 
     /**
-    * 获取 增加 更新用户
-    * @return updateUserIdIncrement
-    */
+     * 获取 增加 更新用户
+     * @return updateUserIdIncrement
+     */
     public Long getUpdateUserIdIncrement(){
         return this.updateUserIdIncrement;
     }
 
     /**
-    * 设置 增加 更新用户
-    * @param updateUserIdIncrement
-    */
+     * 设置 增加 更新用户
+     * @param updateUserIdIncrement
+     */
     public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
         this.updateUserIdIncrement = updateUserIdIncrement;
     }
 
     /**
-    * 获取 更新用户
-    * @return updateUserIdList
-    */
+     * 获取 更新用户
+     * @return updateUserIdList
+     */
     public List<Long> getUpdateUserIdList(){
         return this.updateUserIdList;
     }
 
     /**
-    * 设置 更新用户
-    * @param updateUserIdList
-    */
+     * 设置 更新用户
+     * @param updateUserIdList
+     */
     public void setUpdateUserIdList(List<Long> updateUserIdList){
         this.updateUserIdList = updateUserIdList;
     }
 
     /**
-    * 获取 更新用户名称
-    * @return updateUserNameList
-    */
+     * 获取 更新用户名称
+     * @return updateUserNameList
+     */
     public List<String> getUpdateUserNameList(){
         return this.updateUserNameList;
     }
 
     /**
-    * 设置 更新用户名称
-    * @param updateUserNameList
-    */
+     * 设置 更新用户名称
+     * @param updateUserNameList
+     */
     public void setUpdateUserNameList(List<String> updateUserNameList){
         this.updateUserNameList = updateUserNameList;
     }
     /**
-    * 设置  主键,自增长
-    * @param id
-    */
+     * 设置  主键,自增长
+     * @param id
+     */
     public AppsQuery id(Long id){
-	    setId(id);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 主键,自增长
-    * @param idStart
-    */
+        setId(id);
+        return this;
+    }
+
+    /**
+     * 设置 开始 主键,自增长
+     * @param idStart
+     */
     public AppsQuery idStart(Long idStart){
-		this.idStart = idStart;
-		return this;
+        this.idStart = idStart;
+        return this;
     }
 
     /**
-    * 设置 结束 主键,自增长
-    * @param idEnd
-    */
+     * 设置 结束 主键,自增长
+     * @param idEnd
+     */
     public AppsQuery idEnd(Long idEnd){
-		this.idEnd = idEnd;
-		return this;
+        this.idEnd = idEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 主键,自增长
-    * @param idIncrement
-    */
+     * 设置 增加 主键,自增长
+     * @param idIncrement
+     */
     public AppsQuery idIncrement(Long idIncrement){
-		this.idIncrement = idIncrement;
-		return this;
+        this.idIncrement = idIncrement;
+        return this;
     }
 
     /**
-    * 设置 主键,自增长
-    * @param idList
-    */
+     * 设置 主键,自增长
+     * @param idList
+     */
     public AppsQuery idList(List<Long> idList){
         this.idList = idList;
-		return this;
-        }
+        return this;
+    }
 
 
-	/**
-    * 设置 应用名称
-    * @param name
-    */
+    /**
+     * 设置 应用名称
+     * @param name
+     */
     public AppsQuery name(String name){
         setName(name);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 应用名称
-    * @param nameList
-    */
+     * 设置 应用名称
+     * @param nameList
+     */
     public AppsQuery nameList(List<String> nameList){
         this.nameList = nameList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 应用编码
-    * @param code
-    */
-    public AppsQuery code(String code){
-        setCode(code);
-		return this;
+    /**
+     * 设置 图标
+     * @param imgPath
+     */
+    public AppsQuery imgPath(String imgPath){
+        setImgPath(imgPath);
+        return this;
     }
 
     /**
-    * 设置 应用编码
-    * @param codeList
-    */
-    public AppsQuery codeList(List<String> codeList){
-        this.codeList = codeList;
-		return this;
+     * 设置 图标
+     * @param imgPathList
+     */
+    public AppsQuery imgPathList(List<String> imgPathList){
+        this.imgPathList = imgPathList;
+        return this;
     }
 
 
-	/**
-    * 设置 连接地址
-    * @param url
-    */
+    /**
+     * 设置 连接地址
+     * @param url
+     */
     public AppsQuery url(String url){
         setUrl(url);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 连接地址
-    * @param urlList
-    */
+     * 设置 连接地址
+     * @param urlList
+     */
     public AppsQuery urlList(List<String> urlList){
         this.urlList = urlList;
-		return this;
+        return this;
     }
 
     /**
-    * 设置  状态，0暂未开通，1已开通
-    * @param status
-    */
+     * 设置  状态，0暂未开通，1已开通
+     * @param status
+     */
     public AppsQuery status(Integer status){
-	    setStatus(status);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 状态，0暂未开通，1已开通
-    * @param statusStart
-    */
+        setStatus(status);
+        return this;
+    }
+
+    /**
+     * 设置 开始 状态，0暂未开通，1已开通
+     * @param statusStart
+     */
     public AppsQuery statusStart(Integer statusStart){
-		this.statusStart = statusStart;
-		return this;
+        this.statusStart = statusStart;
+        return this;
     }
 
     /**
-    * 设置 结束 状态，0暂未开通，1已开通
-    * @param statusEnd
-    */
+     * 设置 结束 状态，0暂未开通，1已开通
+     * @param statusEnd
+     */
     public AppsQuery statusEnd(Integer statusEnd){
-		this.statusEnd = statusEnd;
-		return this;
+        this.statusEnd = statusEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 状态，0暂未开通，1已开通
-    * @param statusIncrement
-    */
+     * 设置 增加 状态，0暂未开通，1已开通
+     * @param statusIncrement
+     */
     public AppsQuery statusIncrement(Integer statusIncrement){
-		this.statusIncrement = statusIncrement;
-		return this;
+        this.statusIncrement = statusIncrement;
+        return this;
     }
 
     /**
-    * 设置 状态，0暂未开通，1已开通
-    * @param statusList
-    */
+     * 设置 状态，0暂未开通，1已开通
+     * @param statusList
+     */
     public AppsQuery statusList(List<Integer> statusList){
         this.statusList = statusList;
-		return this;
-        }
+        return this;
+    }
 
     /**
-    * 设置  排序号
-    * @param sortNum
-    */
+     * 设置  排序号
+     * @param sortNum
+     */
     public AppsQuery sortNum(Integer sortNum){
-	    setSortNum(sortNum);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 排序号
-    * @param sortNumStart
-    */
+        setSortNum(sortNum);
+        return this;
+    }
+
+    /**
+     * 设置 开始 排序号
+     * @param sortNumStart
+     */
     public AppsQuery sortNumStart(Integer sortNumStart){
-		this.sortNumStart = sortNumStart;
-		return this;
+        this.sortNumStart = sortNumStart;
+        return this;
     }
 
     /**
-    * 设置 结束 排序号
-    * @param sortNumEnd
-    */
+     * 设置 结束 排序号
+     * @param sortNumEnd
+     */
     public AppsQuery sortNumEnd(Integer sortNumEnd){
-		this.sortNumEnd = sortNumEnd;
-		return this;
+        this.sortNumEnd = sortNumEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 排序号
-    * @param sortNumIncrement
-    */
+     * 设置 增加 排序号
+     * @param sortNumIncrement
+     */
     public AppsQuery sortNumIncrement(Integer sortNumIncrement){
-		this.sortNumIncrement = sortNumIncrement;
-		return this;
+        this.sortNumIncrement = sortNumIncrement;
+        return this;
     }
 
     /**
-    * 设置 排序号
-    * @param sortNumList
-    */
+     * 设置 排序号
+     * @param sortNumList
+     */
     public AppsQuery sortNumList(List<Integer> sortNumList){
         this.sortNumList = sortNumList;
-		return this;
-        }
+        return this;
+    }
 
 
-	/**
-    * 设置 描述
-    * @param remark
-    */
+    /**
+     * 设置 描述
+     * @param remark
+     */
     public AppsQuery remark(String remark){
         setRemark(remark);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 描述
-    * @param remarkList
-    */
+     * 设置 描述
+     * @param remarkList
+     */
     public AppsQuery remarkList(List<String> remarkList){
         this.remarkList = remarkList;
-		return this;
+        return this;
     }
 
 
 
     /**
-    * 设置  创建用户ID
-    * @param createUserId
-    */
+     * 设置  创建用户ID
+     * @param createUserId
+     */
     public AppsQuery createUserId(Long createUserId){
-	    setCreateUserId(createUserId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 创建用户ID
-    * @param createUserIdStart
-    */
+        setCreateUserId(createUserId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 创建用户ID
+     * @param createUserIdStart
+     */
     public AppsQuery createUserIdStart(Long createUserIdStart){
-		this.createUserIdStart = createUserIdStart;
-		return this;
+        this.createUserIdStart = createUserIdStart;
+        return this;
     }
 
     /**
-    * 设置 结束 创建用户ID
-    * @param createUserIdEnd
-    */
+     * 设置 结束 创建用户ID
+     * @param createUserIdEnd
+     */
     public AppsQuery createUserIdEnd(Long createUserIdEnd){
-		this.createUserIdEnd = createUserIdEnd;
-		return this;
+        this.createUserIdEnd = createUserIdEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 创建用户ID
-    * @param createUserIdIncrement
-    */
+     * 设置 增加 创建用户ID
+     * @param createUserIdIncrement
+     */
     public AppsQuery createUserIdIncrement(Long createUserIdIncrement){
-		this.createUserIdIncrement = createUserIdIncrement;
-		return this;
+        this.createUserIdIncrement = createUserIdIncrement;
+        return this;
     }
 
     /**
-    * 设置 创建用户ID
-    * @param createUserIdList
-    */
+     * 设置 创建用户ID
+     * @param createUserIdList
+     */
     public AppsQuery createUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
-		return this;
-        }
+        return this;
+    }
 
 
-	/**
-    * 设置 创建用户名称
-    * @param createUserName
-    */
+    /**
+     * 设置 创建用户名称
+     * @param createUserName
+     */
     public AppsQuery createUserName(String createUserName){
         setCreateUserName(createUserName);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 创建用户名称
-    * @param createUserNameList
-    */
+     * 设置 创建用户名称
+     * @param createUserNameList
+     */
     public AppsQuery createUserNameList(List<String> createUserNameList){
         this.createUserNameList = createUserNameList;
-		return this;
+        return this;
     }
 
     /**
-    * 设置  更新用户
-    * @param updateUserId
-    */
+     * 设置  更新用户
+     * @param updateUserId
+     */
     public AppsQuery updateUserId(Long updateUserId){
-	    setUpdateUserId(updateUserId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 更新用户
-    * @param updateUserIdStart
-    */
+        setUpdateUserId(updateUserId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 更新用户
+     * @param updateUserIdStart
+     */
     public AppsQuery updateUserIdStart(Long updateUserIdStart){
-		this.updateUserIdStart = updateUserIdStart;
-		return this;
+        this.updateUserIdStart = updateUserIdStart;
+        return this;
     }
 
     /**
-    * 设置 结束 更新用户
-    * @param updateUserIdEnd
-    */
+     * 设置 结束 更新用户
+     * @param updateUserIdEnd
+     */
     public AppsQuery updateUserIdEnd(Long updateUserIdEnd){
-		this.updateUserIdEnd = updateUserIdEnd;
-		return this;
+        this.updateUserIdEnd = updateUserIdEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 更新用户
-    * @param updateUserIdIncrement
-    */
+     * 设置 增加 更新用户
+     * @param updateUserIdIncrement
+     */
     public AppsQuery updateUserIdIncrement(Long updateUserIdIncrement){
-		this.updateUserIdIncrement = updateUserIdIncrement;
-		return this;
+        this.updateUserIdIncrement = updateUserIdIncrement;
+        return this;
     }
 
     /**
-    * 设置 更新用户
-    * @param updateUserIdList
-    */
+     * 设置 更新用户
+     * @param updateUserIdList
+     */
     public AppsQuery updateUserIdList(List<Long> updateUserIdList){
         this.updateUserIdList = updateUserIdList;
-		return this;
-        }
+        return this;
+    }
 
 
-	/**
-    * 设置 更新用户名称
-    * @param updateUserName
-    */
+    /**
+     * 设置 更新用户名称
+     * @param updateUserName
+     */
     public AppsQuery updateUserName(String updateUserName){
         setUpdateUserName(updateUserName);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 更新用户名称
-    * @param updateUserNameList
-    */
+     * 设置 更新用户名称
+     * @param updateUserNameList
+     */
     public AppsQuery updateUserNameList(List<String> updateUserNameList){
         this.updateUserNameList = updateUserNameList;
-		return this;
+        return this;
     }
 
     /**
-    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @return orConditionList
-    */
+     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @return orConditionList
+     */
     public List<AppsQuery> getOrConditionList(){
-    return this.orConditionList;
+        return this.orConditionList;
     }
 
     /**
-    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @param 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<AppsQuery> orConditionList){
         this.orConditionList = orConditionList;
     }
 
     /**
-    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @return andConditionList
-    */
+     * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @return andConditionList
+     */
     public List<AppsQuery> getAndConditionList(){
         return this.andConditionList;
     }
 
     /**
-    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @param 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<AppsQuery> andConditionList){
         this.andConditionList = andConditionList;
     }

portal-manager/src/main/resources/sqlmap/module/apps/AppsMapper.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.apps.dao.ibatis.AppsDaoImpl">
 
     <!-- 字段和属性映射 -->
     <resultMap type="AppsEntity" id="AppsEntity-Map">
-            <id  property="id" column="id" />
-            <result property="name" column="name" />
-            <result property="code" column="code" />
-            <result property="url" column="url" />
-            <result property="status" column="status" />
-            <result property="sortNum" column="sortNum" />
-            <result property="remark" column="remark" />
-            <result property="createTime" column="createTime" />
-            <result property="updateTime" column="updateTime" />
-            <result property="createUserId" column="createUserId" />
-            <result property="createUserName" column="createUserName" />
-            <result property="updateUserId" column="updateUserId" />
-            <result property="updateUserName" column="updateUserName" />
-            
+        <id  property="id" column="id" />
+        <result property="name" column="name" />
+        <result property="imgPath" column="imgPath" />
+        <result property="url" column="url" />
+        <result property="status" column="status" />
+        <result property="sortNum" column="sortNum" />
+        <result property="remark" column="remark" />
+        <result property="createTime" column="createTime" />
+        <result property="updateTime" column="updateTime" />
+        <result property="createUserId" column="createUserId" />
+        <result property="createUserName" column="createUserName" />
+        <result property="updateUserId" column="updateUserId" />
+        <result property="updateUserName" column="updateUserName" />
+
     </resultMap>
 
 
     <!-- 表所有列 -->
     <sql id="_columns">
         <trim suffixOverrides="," suffix="">
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
-                    a.id,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
-                    a.name,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('code') or colPickMode == 1 and data.containsKey('code')))">
-                    a.code,
-                </if>
-                <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('status') or colPickMode == 1 and data.containsKey('status')))">
-                    a.status,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sortNum') or colPickMode == 1 and data.containsKey('sortNum')))">
-                    a.sortNum,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
-                    a.remark,
-                </if>
-                <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('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
-                    a.updateTime,
-                </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>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserName') or colPickMode == 1 and data.containsKey('createUserName')))">
-                    a.createUserName,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
-                    a.updateUserId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserName') or colPickMode == 1 and data.containsKey('updateUserName')))">
-                    a.updateUserName,
-                </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                a.id,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
+                a.name,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('imgPath') or colPickMode == 1 and data.containsKey('imgPath')))">
+                a.imgPath,
+            </if>
+            <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('status') or colPickMode == 1 and data.containsKey('status')))">
+                a.status,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sortNum') or colPickMode == 1 and data.containsKey('sortNum')))">
+                a.sortNum,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
+                a.remark,
+            </if>
+            <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('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                a.updateTime,
+            </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>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserName') or colPickMode == 1 and data.containsKey('createUserName')))">
+                a.createUserName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                a.updateUserId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserName') or colPickMode == 1 and data.containsKey('updateUserName')))">
+                a.updateUserName,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="AppsEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_apps
-        (name,code,url,status,sortNum,remark,createTime,updateTime,createUserId,createUserName,updateUserId,updateUserName)
+        (name,imgPath,url,status,sortNum,remark,createTime,updateTime,createUserId,createUserName,updateUserId,updateUserName)
         VALUES
-        (#{name},#{code},#{url},#{status},#{sortNum},#{remark},#{createTime},#{updateTime},#{createUserId},#{createUserName},#{updateUserId},#{updateUserName})
+        (#{name},#{imgPath},#{url},#{status},#{sortNum},#{remark},#{createTime},#{updateTime},#{createUserId},#{createUserName},#{updateUserId},#{updateUserName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_apps
-        (name,code,url,status,sortNum,remark,createTime,updateTime,createUserId,createUserName,updateUserId,updateUserName)
+        (name,imgPath,url,status,sortNum,remark,createTime,updateTime,createUserId,createUserName,updateUserId,updateUserName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.name},#{item.code},#{item.url},#{item.status},#{item.sortNum},#{item.remark},#{item.createTime},#{item.updateTime},#{item.createUserId},#{item.createUserName},#{item.updateUserId},#{item.updateUserName})
+            (#{item.name},#{item.imgPath},#{item.url},#{item.status},#{item.sortNum},#{item.remark},#{item.createTime},#{item.updateTime},#{item.createUserId},#{item.createUserName},#{item.updateUserId},#{item.updateUserName})
         </foreach>
     </insert>
 
@@ -93,8 +93,8 @@
             <if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))">
                 a.name=#{data.name},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('code')) or (colPickMode==1 and !data.containsKey('code'))">
-                a.code=#{data.code},
+            <if test="(colPickMode==0 and data.containsKey('imgPath')) or (colPickMode==1 and !data.containsKey('imgPath'))">
+                a.imgPath=#{data.imgPath},
             </if>
             <if test="(colPickMode==0 and data.containsKey('url')) or (colPickMode==1 and !data.containsKey('url'))">
                 a.url=#{data.url},
@@ -150,110 +150,110 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_xhx_apps as a
         <trim prefix="set" suffixOverrides=",">
-                <trim prefix="name=(case" suffix="ELSE name end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
-                            when a.id=#{item.id} then #{item.name}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="code=(case" suffix="ELSE code end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('code')) or (colPickMode==1 and !item.containsKey('code'))">
-                            when a.id=#{item.id} then #{item.code}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="url=(case" suffix="ELSE url end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('url')) or (colPickMode==1 and !item.containsKey('url'))">
-                            when a.id=#{item.id} then #{item.url}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="status=(case" suffix="ELSE status end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))">
-                                        when a.id=#{item.id} then #{item.status}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="sortNum=(case" suffix="ELSE sortNum end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('sortNum')) or (colPickMode==1 and !item.containsKey('sortNum'))">
-                                        when a.id=#{item.id} then #{item.sortNum}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('sortNumIncrement')) or (colPickMode==1 and !item.containsKey('sortNumIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.sortNum,0) + #{item.sortNumIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="remark=(case" suffix="ELSE remark end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
-                            when a.id=#{item.id} then #{item.remark}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
-                            when a.id=#{item.id} then #{item.createTime}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
-                            when a.id=#{item.id} then #{item.updateTime}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
-                                        when a.id=#{item.id} then #{item.createUserId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="createUserName=(case" suffix="ELSE createUserName end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('createUserName')) or (colPickMode==1 and !item.containsKey('createUserName'))">
-                            when a.id=#{item.id} then #{item.createUserName}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
-                                        when a.id=#{item.id} then #{item.updateUserId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="updateUserName=(case" suffix="ELSE updateUserName end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('updateUserName')) or (colPickMode==1 and !item.containsKey('updateUserName'))">
-                            when a.id=#{item.id} then #{item.updateUserName}
-                        </if>
-                    </foreach>
-                </trim>
+            <trim prefix="name=(case" suffix="ELSE name end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
+                        when a.id=#{item.id} then #{item.name}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="imgPath=(case" suffix="ELSE imgPath end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('imgPath')) or (colPickMode==1 and !item.containsKey('imgPath'))">
+                        when a.id=#{item.id} then #{item.imgPath}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="url=(case" suffix="ELSE url end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('url')) or (colPickMode==1 and !item.containsKey('url'))">
+                        when a.id=#{item.id} then #{item.url}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="status=(case" suffix="ELSE status end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))">
+                            when a.id=#{item.id} then #{item.status}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="sortNum=(case" suffix="ELSE sortNum end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('sortNum')) or (colPickMode==1 and !item.containsKey('sortNum'))">
+                            when a.id=#{item.id} then #{item.sortNum}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('sortNumIncrement')) or (colPickMode==1 and !item.containsKey('sortNumIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.sortNum,0) + #{item.sortNumIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="remark=(case" suffix="ELSE remark end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
+                        when a.id=#{item.id} then #{item.remark}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                        when a.id=#{item.id} then #{item.createTime}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                        when a.id=#{item.id} then #{item.updateTime}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                            when a.id=#{item.id} then #{item.createUserId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="createUserName=(case" suffix="ELSE createUserName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('createUserName')) or (colPickMode==1 and !item.containsKey('createUserName'))">
+                        when a.id=#{item.id} then #{item.createUserName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                            when a.id=#{item.id} then #{item.updateUserId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="updateUserName=(case" suffix="ELSE updateUserName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('updateUserName')) or (colPickMode==1 and !item.containsKey('updateUserName'))">
+                        when a.id=#{item.id} then #{item.updateUserName}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -355,309 +355,309 @@
                 ${_conditionType_} a.id=#{${_conditionParam_}.id}
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('id')">
-                <if test="conditionParamRef.id != null ">
-                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
-                </if>
-                <if test="conditionParamRef.id == null">
-                    ${_conditionType_} a.id is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('idList')">
-                ${_conditionType_} a.id in
-                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
-                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null ">
+                ${_conditionType_} a.id = #{${_conditionParam_}.id}
             </if>
-            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
-                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            <if test="conditionParamRef.id == null">
+                ${_conditionType_} a.id is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('idList')">
+            ${_conditionType_} a.id in
+            <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+            ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+        </if>
+        <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+            ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('name')">
-                <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
-                    ${_conditionType_} a.name like #{${_conditionParam_}.name}
-                </if>
-                <if test="conditionParamRef.name == null">
-                    ${_conditionType_} a.name is null
-                </if>
+        <if test="conditionParamRef.containsKey('name')">
+            <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
+                ${_conditionType_} a.name like #{${_conditionParam_}.name}
             </if>
-            <if test="conditionParamRef.containsKey('nameList')">
-                ${_conditionType_} a.name in
-                <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.name == null">
+                ${_conditionType_} a.name is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('nameList')">
+            ${_conditionType_} a.name in
+            <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('code')">
-                <if test="conditionParamRef.code != null and conditionParamRef.code != ''">
-                    ${_conditionType_} a.code like #{${_conditionParam_}.code}
-                </if>
-                <if test="conditionParamRef.code == null">
-                    ${_conditionType_} a.code is null
-                </if>
+        <if test="conditionParamRef.containsKey('imgPath')">
+            <if test="conditionParamRef.imgPath != null and conditionParamRef.imgPath != ''">
+                ${_conditionType_} a.imgPath like #{${_conditionParam_}.imgPath}
             </if>
-            <if test="conditionParamRef.containsKey('codeList')">
-                ${_conditionType_} a.code in
-                <foreach collection="conditionParamRef.codeList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.imgPath == null">
+                ${_conditionType_} a.imgPath is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('imgPathList')">
+            ${_conditionType_} a.imgPath in
+            <foreach collection="conditionParamRef.imgPathList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('url')">
-                <if test="conditionParamRef.url != null and conditionParamRef.url != ''">
-                    ${_conditionType_} a.url like #{${_conditionParam_}.url}
-                </if>
-                <if test="conditionParamRef.url == null">
-                    ${_conditionType_} a.url is null
-                </if>
+        <if test="conditionParamRef.containsKey('url')">
+            <if test="conditionParamRef.url != null and conditionParamRef.url != ''">
+                ${_conditionType_} a.url like #{${_conditionParam_}.url}
             </if>
-            <if test="conditionParamRef.containsKey('urlList')">
-                ${_conditionType_} a.url in
-                <foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('status')">
-                <if test="conditionParamRef.status != null ">
-                    ${_conditionType_} a.status = #{${_conditionParam_}.status}
-                </if>
-                <if test="conditionParamRef.status == null">
-                    ${_conditionType_} a.status is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('statusList')">
-                ${_conditionType_} a.status in
-                <foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.url == null">
+                ${_conditionType_} a.url is null
             </if>
-            <if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
-                ${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
+        </if>
+        <if test="conditionParamRef.containsKey('urlList')">
+            ${_conditionType_} a.url in
+            <foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('status')">
+            <if test="conditionParamRef.status != null ">
+                ${_conditionType_} a.status = #{${_conditionParam_}.status}
             </if>
-            <if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null">
-                ${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
+            <if test="conditionParamRef.status == null">
+                ${_conditionType_} a.status is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('statusList')">
+            ${_conditionType_} a.status in
+            <foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
+            ${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
+        </if>
+        <if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null">
+            ${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('sortNum')">
-                <if test="conditionParamRef.sortNum != null ">
-                    ${_conditionType_} a.sortNum = #{${_conditionParam_}.sortNum}
-                </if>
-                <if test="conditionParamRef.sortNum == null">
-                    ${_conditionType_} a.sortNum is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('sortNumList')">
-                ${_conditionType_} a.sortNum in
-                <foreach collection="conditionParamRef.sortNumList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('sortNumStart') and conditionParamRef.sortNumStart != null">
-                ${_conditionType_} a.sortNum <![CDATA[ >= ]]> #{${_conditionParam_}.sortNumStart}
+        <if test="conditionParamRef.containsKey('sortNum')">
+            <if test="conditionParamRef.sortNum != null ">
+                ${_conditionType_} a.sortNum = #{${_conditionParam_}.sortNum}
             </if>
-            <if test="conditionParamRef.containsKey('sortNumEnd') and conditionParamRef.sortNumEnd != null">
-                ${_conditionType_} a.sortNum <![CDATA[ <= ]]> #{${_conditionParam_}.sortNumEnd}
+            <if test="conditionParamRef.sortNum == null">
+                ${_conditionType_} a.sortNum is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('sortNumList')">
+            ${_conditionType_} a.sortNum in
+            <foreach collection="conditionParamRef.sortNumList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('sortNumStart') and conditionParamRef.sortNumStart != null">
+            ${_conditionType_} a.sortNum <![CDATA[ >= ]]> #{${_conditionParam_}.sortNumStart}
+        </if>
+        <if test="conditionParamRef.containsKey('sortNumEnd') and conditionParamRef.sortNumEnd != null">
+            ${_conditionType_} a.sortNum <![CDATA[ <= ]]> #{${_conditionParam_}.sortNumEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('remark')">
-                <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
-                    ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
-                </if>
-                <if test="conditionParamRef.remark == null">
-                    ${_conditionType_} a.remark is null
-                </if>
+        <if test="conditionParamRef.containsKey('remark')">
+            <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
+                ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
             </if>
-            <if test="conditionParamRef.containsKey('remarkList')">
-                ${_conditionType_} a.remark in
-                <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.remark == null">
+                ${_conditionType_} a.remark is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('remarkList')">
+            ${_conditionType_} a.remark in
+            <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('createTime')">
-                <if test="conditionParamRef.createTime != null ">
-                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
-                </if>
-                <if test="conditionParamRef.createTime == null">
-                    ${_conditionType_} a.createTime is null
-                </if>
+        <if test="conditionParamRef.containsKey('createTime')">
+            <if test="conditionParamRef.createTime != null ">
+                ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
             </if>
-            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
-                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-            <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 test="conditionParamRef.createTime == null">
+                ${_conditionType_} a.createTime is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+            ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <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('updateTime')">
-                <if test="conditionParamRef.updateTime != null ">
-                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
-                </if>
-                <if test="conditionParamRef.updateTime == null">
-                    ${_conditionType_} a.updateTime is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
-                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        <if test="conditionParamRef.containsKey('updateTime')">
+            <if test="conditionParamRef.updateTime != null ">
+                ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
             </if>
-            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
-                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-            <if test="conditionParamRef.containsKey('createUserId')">
-                <if test="conditionParamRef.createUserId != null ">
-                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
-                </if>
-                <if test="conditionParamRef.createUserId == null">
-                    ${_conditionType_} a.createUserId is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('createUserIdList')">
-                ${_conditionType_} a.createUserId in
-                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.updateTime == null">
+                ${_conditionType_} a.updateTime is null
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
-                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+            ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+            ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('createUserId')">
+            <if test="conditionParamRef.createUserId != null ">
+                ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
-                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            <if test="conditionParamRef.createUserId == null">
+                ${_conditionType_} a.createUserId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdList')">
+            ${_conditionType_} a.createUserId in
+            <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+            ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+            ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('createUserName')">
-                <if test="conditionParamRef.createUserName != null and conditionParamRef.createUserName != ''">
-                    ${_conditionType_} a.createUserName like #{${_conditionParam_}.createUserName}
-                </if>
-                <if test="conditionParamRef.createUserName == null">
-                    ${_conditionType_} a.createUserName is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('createUserNameList')">
-                ${_conditionType_} a.createUserName in
-                <foreach collection="conditionParamRef.createUserNameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('createUserName')">
+            <if test="conditionParamRef.createUserName != null and conditionParamRef.createUserName != ''">
+                ${_conditionType_} a.createUserName like #{${_conditionParam_}.createUserName}
             </if>
-            <if test="conditionParamRef.containsKey('updateUserId')">
-                <if test="conditionParamRef.updateUserId != null ">
-                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
-                </if>
-                <if test="conditionParamRef.updateUserId == null">
-                    ${_conditionType_} a.updateUserId is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('updateUserIdList')">
-                ${_conditionType_} a.updateUserId in
-                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.createUserName == null">
+                ${_conditionType_} a.createUserName is null
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
-                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('createUserNameList')">
+            ${_conditionType_} a.createUserName in
+            <foreach collection="conditionParamRef.createUserNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('updateUserId')">
+            <if test="conditionParamRef.updateUserId != null ">
+                ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
-                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            <if test="conditionParamRef.updateUserId == null">
+                ${_conditionType_} a.updateUserId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('updateUserIdList')">
+            ${_conditionType_} a.updateUserId in
+            <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+            ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+            ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('updateUserName')">
-                <if test="conditionParamRef.updateUserName != null and conditionParamRef.updateUserName != ''">
-                    ${_conditionType_} a.updateUserName like #{${_conditionParam_}.updateUserName}
-                </if>
-                <if test="conditionParamRef.updateUserName == null">
-                    ${_conditionType_} a.updateUserName is null
-                </if>
+        <if test="conditionParamRef.containsKey('updateUserName')">
+            <if test="conditionParamRef.updateUserName != null and conditionParamRef.updateUserName != ''">
+                ${_conditionType_} a.updateUserName like #{${_conditionParam_}.updateUserName}
             </if>
-            <if test="conditionParamRef.containsKey('updateUserNameList')">
-                ${_conditionType_} a.updateUserName in
-                <foreach collection="conditionParamRef.updateUserNameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.updateUserName == null">
+                ${_conditionType_} a.updateUserName is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('updateUserNameList')">
+            ${_conditionType_} a.updateUserName in
+            <foreach collection="conditionParamRef.updateUserNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
             order by
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     ${item.colName} ${item.sortKind}
+                    ${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
             <trim suffixOverrides=","  suffix="">
-                    <if test="orderCol.containsKey('id')">
-                        a.id
-                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('name')">
-                        a.name
-                        <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('code')">
-                        a.code
-                        <if test='orderCol.code != null and "DESC".equalsIgnoreCase(orderCol.code)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('url')">
-                        a.url
-                        <if test='orderCol.url != null and "DESC".equalsIgnoreCase(orderCol.url)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('status')">
-                        a.status
-                        <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('sortNum')">
-                        a.sortNum
-                        <if test='orderCol.sortNum != null and "DESC".equalsIgnoreCase(orderCol.sortNum)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('remark')">
-                        a.remark
-                        <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('createTime')">
-                        a.createTime
-                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('updateTime')">
-                        a.updateTime
-                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('createUserId')">
-                        a.createUserId
-                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('createUserName')">
-                        a.createUserName
-                        <if test='orderCol.createUserName != null and "DESC".equalsIgnoreCase(orderCol.createUserName)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('updateUserId')">
-                        a.updateUserId
-                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('updateUserName')">
-                        a.updateUserName
-                        <if test='orderCol.updateUserName != null and "DESC".equalsIgnoreCase(orderCol.updateUserName)'>DESC</if>
-                        ,
-                    </if>
+                <if test="orderCol.containsKey('id')">
+                    a.id
+                    <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('name')">
+                    a.name
+                    <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('imgPath')">
+                    a.imgPath
+                    <if test='orderCol.imgPath != null and "DESC".equalsIgnoreCase(orderCol.imgPath)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('url')">
+                    a.url
+                    <if test='orderCol.url != null and "DESC".equalsIgnoreCase(orderCol.url)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('status')">
+                    a.status
+                    <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('sortNum')">
+                    a.sortNum
+                    <if test='orderCol.sortNum != null and "DESC".equalsIgnoreCase(orderCol.sortNum)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('remark')">
+                    a.remark
+                    <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('createTime')">
+                    a.createTime
+                    <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('updateTime')">
+                    a.updateTime
+                    <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('createUserId')">
+                    a.createUserId
+                    <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('createUserName')">
+                    a.createUserName
+                    <if test='orderCol.createUserName != null and "DESC".equalsIgnoreCase(orderCol.createUserName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('updateUserId')">
+                    a.updateUserId
+                    <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('updateUserName')">
+                    a.updateUserName
+                    <if test='orderCol.updateUserName != null and "DESC".equalsIgnoreCase(orderCol.updateUserName)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>