jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4d8367e0c8a67213b48f27b566ecc0b9aa8d3966

Authored by rui.zhang
2 parents 2fbab66a81 a4d3e82d0f
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 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 4d8367e
... ... @@ -527,7 +527,7 @@
527 527 return;
528 528 }
529 529  
530   - //根据当前登录的用户判断是否 有管理员的权限
  530 + /* //根据当前登录的用户判断是否 有管理员的权限
531 531 List<String> list = userRoleMapsService.queryUserRoleName(loginState.getId());
532 532 if(CollectionUtils.isEmpty(list) ||!list.contains(ADMIN)){
533 533 Map<String, Object> map = new HashMap<>();
... ... @@ -535,7 +535,7 @@
535 535 map.put(ResultUtils.ERROR_MSG, "你没有足够的权限.");
536 536 writeJson(response, JsonUtil.obj2JsonString(map));
537 537 return;
538   - }
  538 + }*/
539 539 if (user != null) {
540 540  
541 541 //检查注册账户是否存在
542 542  
... ... @@ -641,14 +641,14 @@
641 641 return;
642 642 }
643 643 //根据当前登录的用户判断是否 有管理员的权限
644   - List<String> list = userRoleMapsService.queryUserRoleName(loginState.getId());
  644 + /* List<String> list = userRoleMapsService.queryUserRoleName(loginState.getId());
645 645 if(CollectionUtils.isEmpty(list) ||!list.contains(ADMIN)){
646 646 Map<String, Object> map = new HashMap<>();
647 647 map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR);
648 648 map.put(ResultUtils.ERROR_MSG, "你没有足够的权限.");
649 649 writeJson(response, JsonUtil.obj2JsonString(map));
650 650 return;
651   - }
  651 + }*/
652 652 if (user != null) {
653 653  
654 654 //检查注册账户是否存在
655 655  
656 656  
... ... @@ -842,15 +842,18 @@
842 842 if (user != null) {
843 843  
844 844 Users users = usersService.getUsers(id);
  845 + if(null!=users.getOtherAccount()&&"1".equals(user.getOtherAccount()+"")){
  846 + return;
  847 + }
845 848 //根据当前登录的用户判断是否 有管理员的权限
846   - List<String> list = userRoleMapsService.queryUserRoleName(loginState.getId());
  849 + /* List<String> list = userRoleMapsService.queryUserRoleName(loginState.getId());
847 850 if(CollectionUtils.isEmpty(list) ||!list.contains(ADMIN)){
848 851 Map<String, Object> map = new HashMap<>();
849 852 map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR);
850 853 map.put(ResultUtils.ERROR_MSG, "你没有足够的权限.");
851 854 writeJson(response, JsonUtil.obj2JsonString(map));
852 855 return;
853   - }
  856 + }*/
854 857 if(null == users) {
855 858 Map<String, Object> map = new HashMap<>();
856 859 map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR);
857 860  
... ... @@ -967,8 +970,15 @@
967 970 writeJson(response, JsonUtil.obj2JsonString(map));
968 971 return;
969 972 }
  973 + Users users =null;
  974 + if(CollectionUtils.isNotEmpty(usersList)){
  975 + users =usersList.get(0);
  976 + if(null!=users.getOtherAccount()&&"1".equals(users.getOtherAccount()+"")){
  977 + return;
  978 + }
  979 + }
970 980  
971   - Users users = new Users();
  981 + users = new Users();
972 982 users.setId(id);
973 983 users.setEnable(flag);
974 984 users.setModified(new Date());