Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
| | |
| | | user.setPhonenumber(config.getPhonenumber()); |
| | | user.setLoginName(config.getLoginName()); |
| | | user.setMasterIds(config.getMasterIds()); |
| | | user.setRoleIds(2+""); |
| | | user.setRoleIds("2"); |
| | | user.setUserType("2"); |
| | | user.setStatus(config.getStatus()); |
| | | user.setUpdateTime(LocalDateTime.now()); |
| | |
| | | public ResultData queryList(@RequestParam(value = "keyWord",required = false) String keyWord){ |
| | | return ResultData.success(IUserService.queryList(2,keyWord)); |
| | | } |
| | | |
| | | } |
| | |
| | | |
| | | public static List<String> getPermission(SysUser sysUser,IOrganizationChartService iOrganizationChartService) |
| | | { |
| | | if (StringUtils.equals("3", sysUser.getRoleIds())) { |
| | | if (StringUtils.equals("3", sysUser.getUserType())) { |
| | | if (StringUtils.isEmpty(sysUser.getDataPermission())) { |
| | | return null; |
| | | } |
| | |
| | | return ids; |
| | | } |
| | | } |
| | | else if(StringUtils.equals("2", sysUser.getRoleIds())) |
| | | else if(StringUtils.equals("2", sysUser.getUserType())) |
| | | { |
| | | //导办人员 |
| | | List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId()); |
| | | return ids; |
| | | } |
| | | else if(StringUtils.equals("1", sysUser.getRoleIds())) |
| | | else if(StringUtils.equals("1", sysUser.getUserType())) |
| | | { |
| | | //管理员 |
| | | List<String> ids=iOrganizationChartService.getIds(""); |