jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 657723bb1344232e9f2681b1826dfd59ad7bd4b4

Authored by jiangjiazhi
2 parents 8a10419011 c36ee11405
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/model/PermissionsQuery.java View file @ 657723b
... ... @@ -23,6 +23,15 @@
23 23 private Date modified;
24 24 private Date created;
25 25 private Integer ismenu;
  26 + private Integer weight;
  27 +
  28 + public Integer getWeight() {
  29 + return weight;
  30 + }
  31 +
  32 + public void setWeight(Integer weight) {
  33 + this.weight = weight;
  34 + }
26 35  
27 36 public Integer getId() {
28 37 return id;
platform-biz-service/src/main/resources/mainOrm/Users.xml View file @ 657723b
... ... @@ -218,7 +218,6 @@
218 218 </if>
219 219 <if test="yn != null">
220 220 and u.yn = #{yn,jdbcType=INTEGER}
221   - and ur.yn = #{yn,jdbcType=INTEGER}
222 221 </if>
223 222 <if test="type != null">
224 223 and u.type = #{type,jdbcType=INTEGER}
... ... @@ -249,7 +248,6 @@
249 248 </if>
250 249 <if test="yn != null and yn != ''">
251 250 and u.yn = #{yn,jdbcType=INTEGER}
252   - and ur.yn = #{yn,jdbcType=INTEGER}
253 251 </if>
254 252 <if test="type != null and type != ''">
255 253 and u.type = #{type,jdbcType=INTEGER}