shuzheng 9 лет назад
Родитель
Сommit
459e866c9f
26 измененных файлов с 6 добавлено и 298 удалено
  1. 0 20
      zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsLogExample.java
  2. 0 20
      zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsOrganizationExample.java
  3. 0 20
      zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsPermissionExample.java
  4. 0 20
      zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsRoleExample.java
  5. 0 20
      zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsRolePermissionExample.java
  6. 0 20
      zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsSystemExample.java
  7. 0 20
      zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsUserExample.java
  8. 0 20
      zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsUserOrganizationExample.java
  9. 0 20
      zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsUserPermissionExample.java
  10. 0 20
      zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsUserRoleExample.java
  11. 0 8
      zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsLogMapper.xml
  12. 0 8
      zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsOrganizationMapper.xml
  13. 0 8
      zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsPermissionMapper.xml
  14. 0 8
      zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsRoleMapper.xml
  15. 0 8
      zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsRolePermissionMapper.xml
  16. 0 8
      zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsSystemMapper.xml
  17. 0 8
      zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsUserMapper.xml
  18. 0 8
      zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsUserOrganizationMapper.xml
  19. 0 8
      zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsUserPermissionMapper.xml
  20. 0 8
      zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsUserRoleMapper.xml
  21. 1 3
      zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsLogController.java
  22. 1 3
      zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsOrganizationController.java
  23. 1 3
      zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsPermissionController.java
  24. 1 3
      zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsRoleController.java
  25. 1 3
      zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsSystemController.java
  26. 1 3
      zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsUserController.java

+ 0 - 20
zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsLogExample.java

@@ -13,10 +13,6 @@ public class UpmsLogExample implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    private Integer limit;
-
-    private Integer offset;
-
     public UpmsLogExample() {
     public UpmsLogExample() {
         oredCriteria = new ArrayList<Criteria>();
         oredCriteria = new ArrayList<Criteria>();
     }
     }
@@ -70,22 +66,6 @@ public class UpmsLogExample implements Serializable {
         distinct = false;
         distinct = false;
     }
     }
 
 
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public void setOffset(Integer offset) {
-        this.offset = offset;
-    }
-
-    public Integer getOffset() {
-        return offset;
-    }
-
     protected abstract static class GeneratedCriteria implements Serializable {
     protected abstract static class GeneratedCriteria implements Serializable {
         protected List<Criterion> criteria;
         protected List<Criterion> criteria;
 
 

+ 0 - 20
zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsOrganizationExample.java

@@ -13,10 +13,6 @@ public class UpmsOrganizationExample implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    private Integer limit;
-
-    private Integer offset;
-
     public UpmsOrganizationExample() {
     public UpmsOrganizationExample() {
         oredCriteria = new ArrayList<Criteria>();
         oredCriteria = new ArrayList<Criteria>();
     }
     }
@@ -70,22 +66,6 @@ public class UpmsOrganizationExample implements Serializable {
         distinct = false;
         distinct = false;
     }
     }
 
 
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public void setOffset(Integer offset) {
-        this.offset = offset;
-    }
-
-    public Integer getOffset() {
-        return offset;
-    }
-
     protected abstract static class GeneratedCriteria implements Serializable {
     protected abstract static class GeneratedCriteria implements Serializable {
         protected List<Criterion> criteria;
         protected List<Criterion> criteria;
 
 

+ 0 - 20
zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsPermissionExample.java

@@ -13,10 +13,6 @@ public class UpmsPermissionExample implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    private Integer limit;
-
-    private Integer offset;
-
     public UpmsPermissionExample() {
     public UpmsPermissionExample() {
         oredCriteria = new ArrayList<Criteria>();
         oredCriteria = new ArrayList<Criteria>();
     }
     }
@@ -70,22 +66,6 @@ public class UpmsPermissionExample implements Serializable {
         distinct = false;
         distinct = false;
     }
     }
 
 
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public void setOffset(Integer offset) {
-        this.offset = offset;
-    }
-
-    public Integer getOffset() {
-        return offset;
-    }
-
     protected abstract static class GeneratedCriteria implements Serializable {
     protected abstract static class GeneratedCriteria implements Serializable {
         protected List<Criterion> criteria;
         protected List<Criterion> criteria;
 
 

+ 0 - 20
zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsRoleExample.java

@@ -13,10 +13,6 @@ public class UpmsRoleExample implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    private Integer limit;
-
-    private Integer offset;
-
     public UpmsRoleExample() {
     public UpmsRoleExample() {
         oredCriteria = new ArrayList<Criteria>();
         oredCriteria = new ArrayList<Criteria>();
     }
     }
@@ -70,22 +66,6 @@ public class UpmsRoleExample implements Serializable {
         distinct = false;
         distinct = false;
     }
     }
 
 
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public void setOffset(Integer offset) {
-        this.offset = offset;
-    }
-
-    public Integer getOffset() {
-        return offset;
-    }
-
     protected abstract static class GeneratedCriteria implements Serializable {
     protected abstract static class GeneratedCriteria implements Serializable {
         protected List<Criterion> criteria;
         protected List<Criterion> criteria;
 
 

+ 0 - 20
zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsRolePermissionExample.java

@@ -13,10 +13,6 @@ public class UpmsRolePermissionExample implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    private Integer limit;
-
-    private Integer offset;
-
     public UpmsRolePermissionExample() {
     public UpmsRolePermissionExample() {
         oredCriteria = new ArrayList<Criteria>();
         oredCriteria = new ArrayList<Criteria>();
     }
     }
@@ -70,22 +66,6 @@ public class UpmsRolePermissionExample implements Serializable {
         distinct = false;
         distinct = false;
     }
     }
 
 
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public void setOffset(Integer offset) {
-        this.offset = offset;
-    }
-
-    public Integer getOffset() {
-        return offset;
-    }
-
     protected abstract static class GeneratedCriteria implements Serializable {
     protected abstract static class GeneratedCriteria implements Serializable {
         protected List<Criterion> criteria;
         protected List<Criterion> criteria;
 
 

+ 0 - 20
zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsSystemExample.java

@@ -13,10 +13,6 @@ public class UpmsSystemExample implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    private Integer limit;
-
-    private Integer offset;
-
     public UpmsSystemExample() {
     public UpmsSystemExample() {
         oredCriteria = new ArrayList<Criteria>();
         oredCriteria = new ArrayList<Criteria>();
     }
     }
@@ -70,22 +66,6 @@ public class UpmsSystemExample implements Serializable {
         distinct = false;
         distinct = false;
     }
     }
 
 
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public void setOffset(Integer offset) {
-        this.offset = offset;
-    }
-
-    public Integer getOffset() {
-        return offset;
-    }
-
     protected abstract static class GeneratedCriteria implements Serializable {
     protected abstract static class GeneratedCriteria implements Serializable {
         protected List<Criterion> criteria;
         protected List<Criterion> criteria;
 
 

+ 0 - 20
zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsUserExample.java

@@ -13,10 +13,6 @@ public class UpmsUserExample implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    private Integer limit;
-
-    private Integer offset;
-
     public UpmsUserExample() {
     public UpmsUserExample() {
         oredCriteria = new ArrayList<Criteria>();
         oredCriteria = new ArrayList<Criteria>();
     }
     }
@@ -70,22 +66,6 @@ public class UpmsUserExample implements Serializable {
         distinct = false;
         distinct = false;
     }
     }
 
 
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public void setOffset(Integer offset) {
-        this.offset = offset;
-    }
-
-    public Integer getOffset() {
-        return offset;
-    }
-
     protected abstract static class GeneratedCriteria implements Serializable {
     protected abstract static class GeneratedCriteria implements Serializable {
         protected List<Criterion> criteria;
         protected List<Criterion> criteria;
 
 

+ 0 - 20
zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsUserOrganizationExample.java

@@ -13,10 +13,6 @@ public class UpmsUserOrganizationExample implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    private Integer limit;
-
-    private Integer offset;
-
     public UpmsUserOrganizationExample() {
     public UpmsUserOrganizationExample() {
         oredCriteria = new ArrayList<Criteria>();
         oredCriteria = new ArrayList<Criteria>();
     }
     }
@@ -70,22 +66,6 @@ public class UpmsUserOrganizationExample implements Serializable {
         distinct = false;
         distinct = false;
     }
     }
 
 
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public void setOffset(Integer offset) {
-        this.offset = offset;
-    }
-
-    public Integer getOffset() {
-        return offset;
-    }
-
     protected abstract static class GeneratedCriteria implements Serializable {
     protected abstract static class GeneratedCriteria implements Serializable {
         protected List<Criterion> criteria;
         protected List<Criterion> criteria;
 
 

+ 0 - 20
zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsUserPermissionExample.java

@@ -13,10 +13,6 @@ public class UpmsUserPermissionExample implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    private Integer limit;
-
-    private Integer offset;
-
     public UpmsUserPermissionExample() {
     public UpmsUserPermissionExample() {
         oredCriteria = new ArrayList<Criteria>();
         oredCriteria = new ArrayList<Criteria>();
     }
     }
@@ -70,22 +66,6 @@ public class UpmsUserPermissionExample implements Serializable {
         distinct = false;
         distinct = false;
     }
     }
 
 
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public void setOffset(Integer offset) {
-        this.offset = offset;
-    }
-
-    public Integer getOffset() {
-        return offset;
-    }
-
     protected abstract static class GeneratedCriteria implements Serializable {
     protected abstract static class GeneratedCriteria implements Serializable {
         protected List<Criterion> criteria;
         protected List<Criterion> criteria;
 
 

+ 0 - 20
zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsUserRoleExample.java

@@ -13,10 +13,6 @@ public class UpmsUserRoleExample implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    private Integer limit;
-
-    private Integer offset;
-
     public UpmsUserRoleExample() {
     public UpmsUserRoleExample() {
         oredCriteria = new ArrayList<Criteria>();
         oredCriteria = new ArrayList<Criteria>();
     }
     }
@@ -70,22 +66,6 @@ public class UpmsUserRoleExample implements Serializable {
         distinct = false;
         distinct = false;
     }
     }
 
 
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public void setOffset(Integer offset) {
-        this.offset = offset;
-    }
-
-    public Integer getOffset() {
-        return offset;
-    }
-
     protected abstract static class GeneratedCriteria implements Serializable {
     protected abstract static class GeneratedCriteria implements Serializable {
         protected List<Criterion> criteria;
         protected List<Criterion> criteria;
 
 

+ 0 - 8
zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsLogMapper.xml

@@ -113,14 +113,6 @@
     <if test="orderByClause != null">
     <if test="orderByClause != null">
       order by ${orderByClause}
       order by ${orderByClause}
     </if>
     </if>
-    <if test="limit != null">
-      <if test="offset != null">
-        limit ${offset}, ${limit}
-      </if>
-      <if test="offset == null">
-        limit ${limit}
-      </if>
-    </if>
   </select>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
     select 
     select 

+ 0 - 8
zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsOrganizationMapper.xml

@@ -82,14 +82,6 @@
     <if test="orderByClause != null">
     <if test="orderByClause != null">
       order by ${orderByClause}
       order by ${orderByClause}
     </if>
     </if>
-    <if test="limit != null">
-      <if test="offset != null">
-        limit ${offset}, ${limit}
-      </if>
-      <if test="offset == null">
-        limit ${limit}
-      </if>
-    </if>
   </select>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     select 

+ 0 - 8
zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsPermissionMapper.xml

@@ -89,14 +89,6 @@
     <if test="orderByClause != null">
     <if test="orderByClause != null">
       order by ${orderByClause}
       order by ${orderByClause}
     </if>
     </if>
-    <if test="limit != null">
-      <if test="offset != null">
-        limit ${offset}, ${limit}
-      </if>
-      <if test="offset == null">
-        limit ${limit}
-      </if>
-    </if>
   </select>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     select 

+ 0 - 8
zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsRoleMapper.xml

@@ -83,14 +83,6 @@
     <if test="orderByClause != null">
     <if test="orderByClause != null">
       order by ${orderByClause}
       order by ${orderByClause}
     </if>
     </if>
-    <if test="limit != null">
-      <if test="offset != null">
-        limit ${offset}, ${limit}
-      </if>
-      <if test="offset == null">
-        limit ${limit}
-      </if>
-    </if>
   </select>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     select 

+ 0 - 8
zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsRolePermissionMapper.xml

@@ -80,14 +80,6 @@
     <if test="orderByClause != null">
     <if test="orderByClause != null">
       order by ${orderByClause}
       order by ${orderByClause}
     </if>
     </if>
-    <if test="limit != null">
-      <if test="offset != null">
-        limit ${offset}, ${limit}
-      </if>
-      <if test="offset == null">
-        limit ${limit}
-      </if>
-    </if>
   </select>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     select 

+ 0 - 8
zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsSystemMapper.xml

@@ -89,14 +89,6 @@
     <if test="orderByClause != null">
     <if test="orderByClause != null">
       order by ${orderByClause}
       order by ${orderByClause}
     </if>
     </if>
-    <if test="limit != null">
-      <if test="offset != null">
-        limit ${offset}, ${limit}
-      </if>
-      <if test="offset == null">
-        limit ${limit}
-      </if>
-    </if>
   </select>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     select 

+ 0 - 8
zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsUserMapper.xml

@@ -88,14 +88,6 @@
     <if test="orderByClause != null">
     <if test="orderByClause != null">
       order by ${orderByClause}
       order by ${orderByClause}
     </if>
     </if>
-    <if test="limit != null">
-      <if test="offset != null">
-        limit ${offset}, ${limit}
-      </if>
-      <if test="offset == null">
-        limit ${limit}
-      </if>
-    </if>
   </select>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     select 

+ 0 - 8
zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsUserOrganizationMapper.xml

@@ -80,14 +80,6 @@
     <if test="orderByClause != null">
     <if test="orderByClause != null">
       order by ${orderByClause}
       order by ${orderByClause}
     </if>
     </if>
-    <if test="limit != null">
-      <if test="offset != null">
-        limit ${offset}, ${limit}
-      </if>
-      <if test="offset == null">
-        limit ${limit}
-      </if>
-    </if>
   </select>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     select 

+ 0 - 8
zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsUserPermissionMapper.xml

@@ -81,14 +81,6 @@
     <if test="orderByClause != null">
     <if test="orderByClause != null">
       order by ${orderByClause}
       order by ${orderByClause}
     </if>
     </if>
-    <if test="limit != null">
-      <if test="offset != null">
-        limit ${offset}, ${limit}
-      </if>
-      <if test="offset == null">
-        limit ${limit}
-      </if>
-    </if>
   </select>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     select 

+ 0 - 8
zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/dao/mapper/UpmsUserRoleMapper.xml

@@ -80,14 +80,6 @@
     <if test="orderByClause != null">
     <if test="orderByClause != null">
       order by ${orderByClause}
       order by ${orderByClause}
     </if>
     </if>
-    <if test="limit != null">
-      <if test="offset != null">
-        limit ${offset}, ${limit}
-      </if>
-      <if test="offset == null">
-        limit ${limit}
-      </if>
-    </if>
   </select>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     select 

+ 1 - 3
zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsLogController.java

@@ -52,8 +52,6 @@ public class UpmsLogController extends BaseController {
             @RequestParam(required = false, value = "sort") String sort,
             @RequestParam(required = false, value = "sort") String sort,
             @RequestParam(required = false, value = "order") String order) {
             @RequestParam(required = false, value = "order") String order) {
         UpmsLogExample upmsLogExample = new UpmsLogExample();
         UpmsLogExample upmsLogExample = new UpmsLogExample();
-        upmsLogExample.setOffset(offset);
-        upmsLogExample.setLimit(limit);
         if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
         if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
             upmsLogExample.setOrderByClause(sort + " " + order);
             upmsLogExample.setOrderByClause(sort + " " + order);
         }
         }
@@ -61,7 +59,7 @@ public class UpmsLogController extends BaseController {
             upmsLogExample.or()
             upmsLogExample.or()
                     .andDescriptionLike("%" + search + "%");
                     .andDescriptionLike("%" + search + "%");
         }
         }
-        List<UpmsLog> rows = upmsLogService.selectByExample(upmsLogExample);
+        List<UpmsLog> rows = upmsLogService.selectByExampleForOffsetPage(upmsLogExample, offset, limit);
         long total = upmsLogService.countByExample(upmsLogExample);
         long total = upmsLogService.countByExample(upmsLogExample);
         Map<String, Object> result = new HashMap<>();
         Map<String, Object> result = new HashMap<>();
         result.put("rows", rows);
         result.put("rows", rows);

+ 1 - 3
zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsOrganizationController.java

@@ -57,8 +57,6 @@ public class UpmsOrganizationController extends BaseController {
             @RequestParam(required = false, value = "sort") String sort,
             @RequestParam(required = false, value = "sort") String sort,
             @RequestParam(required = false, value = "order") String order) {
             @RequestParam(required = false, value = "order") String order) {
         UpmsOrganizationExample upmsOrganizationExample = new UpmsOrganizationExample();
         UpmsOrganizationExample upmsOrganizationExample = new UpmsOrganizationExample();
-        upmsOrganizationExample.setOffset(offset);
-        upmsOrganizationExample.setLimit(limit);
         if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
         if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
             upmsOrganizationExample.setOrderByClause(sort + " " + order);
             upmsOrganizationExample.setOrderByClause(sort + " " + order);
         }
         }
@@ -66,7 +64,7 @@ public class UpmsOrganizationController extends BaseController {
             upmsOrganizationExample.or()
             upmsOrganizationExample.or()
                     .andNameLike("%" + search + "%");
                     .andNameLike("%" + search + "%");
         }
         }
-        List<UpmsOrganization> rows = upmsOrganizationService.selectByExample(upmsOrganizationExample);
+        List<UpmsOrganization> rows = upmsOrganizationService.selectByExampleForOffsetPage(upmsOrganizationExample, offset, limit);
         long total = upmsOrganizationService.countByExample(upmsOrganizationExample);
         long total = upmsOrganizationService.countByExample(upmsOrganizationExample);
         Map<String, Object> result = new HashMap<>();
         Map<String, Object> result = new HashMap<>();
         result.put("rows", rows);
         result.put("rows", rows);

+ 1 - 3
zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsPermissionController.java

@@ -77,8 +77,6 @@ public class UpmsPermissionController extends BaseController {
         if (0 != systemId) {
         if (0 != systemId) {
             criteria.andSystemIdEqualTo(systemId);
             criteria.andSystemIdEqualTo(systemId);
         }
         }
-        upmsPermissionExample.setOffset(offset);
-        upmsPermissionExample.setLimit(limit);
         if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
         if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
             upmsPermissionExample.setOrderByClause(sort + " " + order);
             upmsPermissionExample.setOrderByClause(sort + " " + order);
         }
         }
@@ -86,7 +84,7 @@ public class UpmsPermissionController extends BaseController {
             upmsPermissionExample.or()
             upmsPermissionExample.or()
                     .andNameLike("%" + search + "%");
                     .andNameLike("%" + search + "%");
         }
         }
-        List<UpmsPermission> rows = upmsPermissionService.selectByExample(upmsPermissionExample);
+        List<UpmsPermission> rows = upmsPermissionService.selectByExampleForOffsetPage(upmsPermissionExample, offset, limit);
         long total = upmsPermissionService.countByExample(upmsPermissionExample);
         long total = upmsPermissionService.countByExample(upmsPermissionExample);
         Map<String, Object> result = new HashMap<>();
         Map<String, Object> result = new HashMap<>();
         result.put("rows", rows);
         result.put("rows", rows);

+ 1 - 3
zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsRoleController.java

@@ -86,8 +86,6 @@ public class UpmsRoleController extends BaseController {
             @RequestParam(required = false, value = "sort") String sort,
             @RequestParam(required = false, value = "sort") String sort,
             @RequestParam(required = false, value = "order") String order) {
             @RequestParam(required = false, value = "order") String order) {
         UpmsRoleExample upmsRoleExample = new UpmsRoleExample();
         UpmsRoleExample upmsRoleExample = new UpmsRoleExample();
-        upmsRoleExample.setOffset(offset);
-        upmsRoleExample.setLimit(limit);
         if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
         if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
             upmsRoleExample.setOrderByClause(sort + " " + order);
             upmsRoleExample.setOrderByClause(sort + " " + order);
         }
         }
@@ -95,7 +93,7 @@ public class UpmsRoleController extends BaseController {
             upmsRoleExample.or()
             upmsRoleExample.or()
                     .andTitleLike("%" + search + "%");
                     .andTitleLike("%" + search + "%");
         }
         }
-        List<UpmsRole> rows = upmsRoleService.selectByExample(upmsRoleExample);
+        List<UpmsRole> rows = upmsRoleService.selectByExampleForOffsetPage(upmsRoleExample, offset, limit);
         long total = upmsRoleService.countByExample(upmsRoleExample);
         long total = upmsRoleService.countByExample(upmsRoleExample);
         Map<String, Object> result = new HashMap<>();
         Map<String, Object> result = new HashMap<>();
         result.put("rows", rows);
         result.put("rows", rows);

+ 1 - 3
zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsSystemController.java

@@ -57,8 +57,6 @@ public class UpmsSystemController extends BaseController {
 			@RequestParam(required = false, value = "sort") String sort,
 			@RequestParam(required = false, value = "sort") String sort,
 			@RequestParam(required = false, value = "order") String order) {
 			@RequestParam(required = false, value = "order") String order) {
 		UpmsSystemExample upmsSystemExample = new UpmsSystemExample();
 		UpmsSystemExample upmsSystemExample = new UpmsSystemExample();
-		upmsSystemExample.setOffset(offset);
-		upmsSystemExample.setLimit(limit);
 		if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
 		if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
 			upmsSystemExample.setOrderByClause(sort + " " + order);
 			upmsSystemExample.setOrderByClause(sort + " " + order);
 		}
 		}
@@ -66,7 +64,7 @@ public class UpmsSystemController extends BaseController {
 			upmsSystemExample.or()
 			upmsSystemExample.or()
 					.andTitleLike("%" + search + "%");
 					.andTitleLike("%" + search + "%");
 		}
 		}
-		List<UpmsSystem> rows = upmsSystemService.selectByExample(upmsSystemExample);
+		List<UpmsSystem> rows = upmsSystemService.selectByExampleForOffsetPage(upmsSystemExample, offset, limit);
 		long total = upmsSystemService.countByExample(upmsSystemExample);
 		long total = upmsSystemService.countByExample(upmsSystemExample);
 		Map<String, Object> result = new HashMap<>();
 		Map<String, Object> result = new HashMap<>();
 		result.put("rows", rows);
 		result.put("rows", rows);

+ 1 - 3
zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsUserController.java

@@ -146,8 +146,6 @@ public class UpmsUserController extends BaseController {
             @RequestParam(required = false, value = "sort") String sort,
             @RequestParam(required = false, value = "sort") String sort,
             @RequestParam(required = false, value = "order") String order) {
             @RequestParam(required = false, value = "order") String order) {
         UpmsUserExample upmsUserExample = new UpmsUserExample();
         UpmsUserExample upmsUserExample = new UpmsUserExample();
-        upmsUserExample.setOffset(offset);
-        upmsUserExample.setLimit(limit);
         if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
         if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
             upmsUserExample.setOrderByClause(sort + " " + order);
             upmsUserExample.setOrderByClause(sort + " " + order);
         }
         }
@@ -157,7 +155,7 @@ public class UpmsUserController extends BaseController {
             upmsUserExample.or()
             upmsUserExample.or()
                     .andUsernameLike("%" + search + "%");
                     .andUsernameLike("%" + search + "%");
         }
         }
-        List<UpmsUser> rows = upmsUserService.selectByExample(upmsUserExample);
+        List<UpmsUser> rows = upmsUserService.selectByExampleForOffsetPage(upmsUserExample, offset, limit);
         long total = upmsUserService.countByExample(upmsUserExample);
         long total = upmsUserService.countByExample(upmsUserExample);
         Map<String, Object> result = new HashMap<>();
         Map<String, Object> result = new HashMap<>();
         result.put("rows", rows);
         result.put("rows", rows);