jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c1a22d73c2a9e820ea1a9187047de395ccf2b39d

Authored by jiangjiazhi
2 parents f2f61c8ac0 c44cf9c5c9
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-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java View file @ c1a22d7
... ... @@ -56,8 +56,8 @@
56 56 }
57 57  
58 58 if(user.getType().equals(1)) {
59   - if(null != user.getOrgId()) {
60   - ResultUtils.buildResultAndWrite(httpServletResponse, ErrorCodeConstants.SYSTEM_ERROR, "user data error!");
  59 + if(null == user.getOrgId()) {
  60 + ResultUtils.buildResultAndWrite(httpServletResponse, ErrorCodeConstants.SYSTEM_ERROR, "user not defined orgId error!");
61 61 return;
62 62 }
63 63 Organization organization = organizationService.getOrganization(user.getOrgId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ c1a22d7
... ... @@ -443,7 +443,6 @@
443 443 //检查注册账户是否存在
444 444 UsersQuery usersQuery = new UsersQuery();
445 445 usersQuery.setPhone(phone);
446   - usersQuery.setType(0);
447 446 usersQuery.setYn(YnEnums.YES.getId());
448 447 List<Users> usersList = usersService.queryUsers(usersQuery);
449 448 if (usersList.size() != 0) {
... ... @@ -548,7 +547,6 @@
548 547  
549 548 //检查注册账户是否存在
550 549 UsersQuery usersQuery = new UsersQuery();
551   - usersQuery.setType(1);
552 550 usersQuery.setPhone(phone);
553 551 usersQuery.setYn(YnEnums.YES.getId());
554 552 List<Users> usersList = usersService.queryUsers(usersQuery);