shiyang / regional-platform

Download as
Browse Code »

Commit 5c48b839ddccf525fd6f63a077b9a6626a2fc606

Authored by jiangjiazhi
2 parents 07cade676b e5eb808e26
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java View file @ 5c48b83
... ... @@ -10,7 +10,7 @@
10 10 private Integer publishId;
11 11 private String publishName;
12 12 private Integer yn;
13   - private Integer enable;
  13 + private Integer enable; //1 ÆôÓÃ 2½ûÓÃ
14 14 private Date modified;
15 15 private Date created;
16 16 private String remarks;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java View file @ 5c48b83
... ... @@ -329,9 +329,12 @@
329 329 }
330 330  
331 331 //修改字段
332   - roles.setEnable(flag);
333   - roles.setModified(new Date());
334   - rolesService.updateRoles(roles);
  332 + if(null != flag && (1 == flag || 2 == flag)) {
  333 + roles.setEnable(flag);
  334 + roles.setModified(new Date());
  335 + rolesService.updateRoles(roles);
  336 + }
  337 +
335 338 ResultUtils.buildSuccessResultAndWrite(response);
336 339 }
337 340  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 5c48b83
... ... @@ -836,6 +836,11 @@
836 836 return;
837 837 }
838 838  
  839 + if(!(null != enable && (1 == enable || 2 == enable))) {
  840 + ResultUtils.buildParameterErrorResultAndWrite(response, "enable参数错误");
  841 + return;
  842 + }
  843 +
839 844 //获取登录用户
840 845 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
841 846 Users user = usersService.getUsers(loginState.getId());