jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c9848703bf8ef6dfe2ef9de64fa4a97ceaccadf1

Authored by jiangjiazhi
2 parents f94380b95d 69e3772ebe
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 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java View file @ c984870
... ... @@ -96,7 +96,6 @@
96 96 departments.setDescription(description);
97 97 departments.setShortcode(shortCode);
98 98 departments.setModified(new Date());
99   - departments.setYn(YnEnums.YES.getId());
100 99 departmentsService.updateDepartments(departments);
101 100  
102 101 ResultUtils.buildSuccessResultAndWrite(response);
... ... @@ -116,8 +115,8 @@
116 115 @RequestParam(value = "pid") Integer pid,
117 116 @RequestParam(value = "name") String name,
118 117 @RequestParam(value = "orgId") Integer orgId,
119   - @RequestParam(value = "description") String description,
120   - @RequestParam(value = "shortCode") String shortCode) {
  118 + @RequestParam(value = "description", required = false) String description,
  119 + @RequestParam(value = "shortCode", required = false) String shortCode) {
121 120  
122 121 Organization organization = organizationService.getOrganization(orgId);
123 122  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ c984870
... ... @@ -101,7 +101,6 @@
101 101 organization.setAddress(address);
102 102 organization.setDescription(description);
103 103 organization.setShortcode(shortCode);
104   - organization.setYn(YnEnums.YES.getId());
105 104 organization.setModified(new Date());
106 105 organizationService.updateOrganization(organization);
107 106  
... ... @@ -125,8 +124,8 @@
125 124 @RequestParam(value = "cityId") Integer cityId,
126 125 @RequestParam(value = "areaId") Integer areaId,
127 126 @RequestParam(value = "address") String address,
128   - @RequestParam(value = "description") String description,
129   - @RequestParam(value = "shortCode") String shortCode) {
  127 + @RequestParam(value = "description", required = false) String description,
  128 + @RequestParam(value = "shortCode", required = false) String shortCode) {
130 129  
131 130 //获取登录用户
132 131 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java View file @ c984870
... ... @@ -102,8 +102,8 @@
102 102 @RequestParam(value = "type")Integer type,
103 103 @RequestParam(value = "name")String name,
104 104 @RequestParam(value = "enable")Integer enable,
105   - @RequestParam(value = "remarks")String remarks,
106   - @RequestParam(value = "shortCode")String shortCode) {
  105 + @RequestParam(value = "remarks", required = false)String remarks,
  106 + @RequestParam(value = "shortCode", required = false)String shortCode) {
107 107  
108 108 //获取登录用户
109 109 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ c984870
... ... @@ -247,11 +247,11 @@
247 247 @RequestParam(value = "type") Integer type,
248 248 @RequestParam(value = "deptId") Integer deptId,
249 249 @RequestParam(value = "orgId") Integer orgId,
250   - @RequestParam(value = "name") String name,
251   - @RequestParam(value = "account")String account,
  250 + @RequestParam(value = "name", required = false) String name,
  251 + @RequestParam(value = "account", required = false)String account,
252 252 @RequestParam(value = "phone") String phone,
253 253 @RequestParam(value = "enable") Integer enable,
254   - @RequestParam(value = "remarks") String remarks,
  254 + @RequestParam(value = "remarks", required = false) String remarks,
255 255 @RequestParam(value = "roleIds") String roleIds) {
256 256  
257 257  
... ... @@ -339,6 +339,7 @@
339 339 @RequestMapping(value = "/users/{id}", method = RequestMethod.PUT)
340 340 @TokenRequired
341 341 public void updateUsers(HttpServletResponse response,
  342 + HttpServletRequest request,
342 343 @PathVariable(value = "id") Integer id,
343 344 @RequestParam(value = "deptId",required = false) Integer deptId,
344 345 @RequestParam(value = "orgId",required = false) Integer orgId,
... ... @@ -359,10 +360,10 @@
359 360 return;
360 361 }
361 362  
362   - //获取登录用户ID
363   - Integer userId = Integer.valueOf(tokenService.getUserId(token));
364   - if (userId != null) {
365   - Users u = usersService.getUsers(userId);
  363 + //获取登录用户
  364 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  365 + Users user = usersService.getUsersByLoginCenterId(loginState.getId());
  366 + if (user != null) {
366 367  
367 368 //检查账户是否存在
368 369 UsersQuery usersQuery = new UsersQuery();
... ... @@ -385,9 +386,6 @@
385 386 users.setPhone(phone);
386 387 users.setEnable(enable);
387 388 users.setRemarks(remarks);
388   - users.setPublishId(u.getId());
389   - users.setPublishName(u.getName());
390   - users.setYn(YnEnums.YES.getId());
391 389 users.setModified(new Date());
392 390 // users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6)));
393 391 usersService.updateUsers(users);
394 392  
395 393  
... ... @@ -408,16 +406,15 @@
408 406  
409 407 UserRoleMaps userRoleMaps = new UserRoleMaps();
410 408 String[] roleArrayIds = roleIds.split(",");
411   - List<Users> user = usersService.queryUsers(usersQuery);
412 409 for (String tmp : roleArrayIds) {
413 410 Roles roles = rolesService.getRoles(Integer.valueOf(tmp));
414 411 if (roles == null || roles.getYn() == YnEnums.NO.getId()) {
415 412 continue;
416 413 }
417 414  
418   - if (user.get(0).getId() != null) {
  415 + if (user.getId() != null) {
419 416 userRoleMaps.setRoleId(Integer.valueOf(Integer.valueOf(tmp)));
420   - userRoleMaps.setUserId(user.get(0).getId());
  417 + userRoleMaps.setUserId(_userId);
421 418 userRoleMaps.setYn(YnEnums.YES.getId());
422 419 userRoleMapsService.addUserRoleMaps(userRoleMaps);
423 420 }