Commit 992b5759627d42aed31a9de3ce8c610ba284374b

Authored by jiangjiazhi

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-biz-service/src/main/resources/mainOrm/Users.xml View file @ 992b575
... ... @@ -222,6 +222,7 @@
222 222 </if>
223 223 <if test="yn != null">
224 224 and u.yn = #{yn,jdbcType=INTEGER}
  225 + and ur.yn = #{yn,jdbcType=INTEGER}
225 226 </if>
226 227 <if test="type != null">
227 228 and u.type = #{type,jdbcType=INTEGER}
... ... @@ -255,6 +256,7 @@
255 256 </if>
256 257 <if test="yn != null and yn != ''">
257 258 and u.yn = #{yn,jdbcType=INTEGER}
  259 + and ur.yn = #{yn,jdbcType=INTEGER}
258 260 </if>
259 261 <if test="type != null ">
260 262 and u.type = #{type,jdbcType=INTEGER}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java View file @ 992b575
... ... @@ -13,8 +13,6 @@
13 13 @NotEmpty(message = "name不能为空.")
14 14 private String name;
15 15  
16   - @FormParam
17   - @NotEmpty(message = "code不能为空.")
18 16 private String code;
19 17 @FormParam
20 18 private int enable;