diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/PermissionsMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/PermissionsMapper.java index d8e8899..7b67960 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/PermissionsMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/PermissionsMapper.java @@ -18,6 +18,8 @@ public interface PermissionsMapper { public List queryPermissions(PermissionsQuery query); - List queryPermissionByRoleIds(Integer roleIds); + List queryPermissionByRoleIds(List statusList); + + List queryPermissionByRoleIds1(Integer roleIds); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PermissionsService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PermissionsService.java index dd9e2be..a4d0f52 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PermissionsService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PermissionsService.java @@ -17,5 +17,6 @@ public interface PermissionsService { public int queryPermissionsCount(PermissionsQuery query); public List queryPermissions(PermissionsQuery query); - List queryPermissionByRoleIds(Integer roleIds); + List queryPermissionByRoleIds(List roleIds); + List queryPermissionByRoleIds1(Integer roleIds); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PermissionsServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PermissionsServiceImpl.java index ce873f2..4bf6b0d 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PermissionsServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PermissionsServiceImpl.java @@ -48,7 +48,10 @@ public class PermissionsServiceImpl implements PermissionsService { return permissionsMapper.queryPermissions(query); } - public List queryPermissionByRoleIds(Integer roleIds) { + public List queryPermissionByRoleIds(List roleIds) { return permissionsMapper.queryPermissionByRoleIds(roleIds); } + public List queryPermissionByRoleIds1(Integer roleIds){ + return permissionsMapper.queryPermissionByRoleIds1(roleIds); + } } \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/Permissions.xml b/platform-biz-service/src/main/resources/mainOrm/Permissions.xml index 9bbd0c2..8b32edc 100644 --- a/platform-biz-service/src/main/resources/mainOrm/Permissions.xml +++ b/platform-biz-service/src/main/resources/mainOrm/Permissions.xml @@ -180,9 +180,16 @@ select count(1) from permissions - + select b.* from role_permission_maps a, permissions b where a.yn=1 and b.yn=1 and a.role_id + in + + #{item} + and a.permission_id=b.id ORDER BY weight + \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java index 20f1538..afa1960 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java @@ -391,7 +391,7 @@ public class RolesController extends BaseController { List permissionses; for (Roles roles1 : roles) { - permissionses = permissionsService.queryPermissionByRoleIds(roles1.getId()); + permissionses = permissionsService.queryPermissionByRoleIds1(roles1.getId()); /* RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery(); rolePermissionMapsQuery.setYn(YnEnums.YES.getId()); @@ -460,7 +460,7 @@ public class RolesController extends BaseController { if (permissions.getYn().equals(YnEnums.NO.getId())) continue; permissionses.add(permissions); }*/ - permissionses= permissionsService.queryPermissionByRoleIds(roles1.getId()); + permissionses= permissionsService.queryPermissionByRoleIds1(roles1.getId()); roles1.setPermissions(permissionses); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index a788e24..76e83af 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -9,7 +9,9 @@ import com.lyms.platform.common.constants.ConstantInterface; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.UserTypeEnum; import com.lyms.platform.common.enums.YnEnums; -import com.lyms.platform.common.utils.*; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.common.utils.LoginUtil; +import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.operate.web.facade.AccessPermissionFacade; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.permission.model.*; @@ -22,10 +24,8 @@ import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import javax.management.relation.Role; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.validation.constraints.Pattern; import java.util.*; /** @@ -61,8 +61,7 @@ public class UsersController extends BaseController { private static final String LYMS = "龙源美生"; - private static final String ADMIN="管理员"; - + private static final String ADMIN = "管理员"; /** @@ -72,10 +71,10 @@ public class UsersController extends BaseController { @ResponseBody @TokenRequired public FrontEndResult getAdminList(HttpServletResponse response, - @RequestParam(value = "keyword", required = false) String keyword, - @RequestParam(value = "rolesId", required = false) Integer rolesId, - @RequestParam(value = "page", required = false) Integer page, - @RequestParam(value = "limit", required = false) Integer limit) { + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "rolesId", required = false) Integer rolesId, + @RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "limit", required = false) Integer limit) { limit = limit == null ? 10 : limit; page = page == null ? 1 : page; @@ -92,7 +91,7 @@ public class UsersController extends BaseController { List users = usersService.queryUsers2(usersQuery); //设置用户角色信息 - for(Users user : users) { + for (Users user : users) { user.setRoles(this.getUserRoles(user.getId())); user.setDepartmentses(departmentsService.getDepartments(user.getDeptId())); @@ -108,7 +107,6 @@ public class UsersController extends BaseController { } - /** * 获取用户列表 */ @@ -117,42 +115,42 @@ public class UsersController extends BaseController { @ResponseBody public FrontEndResult getPermissions(HttpServletResponse response, HttpServletRequest request, - @RequestParam(value = "keyword", required = false) String keyword, - @RequestParam(value = "rolesId", required = false) Integer rolesId, - @RequestParam(value = "page", required = false) Integer page, - @RequestParam(value = "limit", required = false) Integer limit, - @RequestParam(value = "orgId", required = false) Integer orgId, - @RequestParam(value = "deptId", required = false) Integer deptId) { + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "rolesId", required = false) Integer rolesId, + @RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "limit", required = false) Integer limit, + @RequestParam(value = "orgId", required = false) Integer orgId, + @RequestParam(value = "deptId", required = false) Integer deptId) { LoginContext loginContext = (LoginContext) request.getAttribute("loginContext"); Users u = usersService.getUsers(loginContext.getId()); List ids = null; - if(u.getType().equals(UserTypeEnum.NORMAL_USER.getId())) { - if(null != u.getOrgId()) { + if (u.getType().equals(UserTypeEnum.NORMAL_USER.getId())) { + if (null != u.getOrgId()) { orgId = u.getOrgId(); } else { FrontEndResult frontEndResult = new FrontEndResult(); - frontEndResult.setPageInfo(new PageInfo(0,0,0,10)); + frontEndResult.setPageInfo(new PageInfo(0, 0, 0, 10)); frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); - return frontEndResult; + return frontEndResult; } - }else if(u.getType().equals(UserTypeEnum.PLATFORM_ADMIN.getId())) { + } else if (u.getType().equals(UserTypeEnum.PLATFORM_ADMIN.getId())) { List organizations = accessPermissionFacade.findAccessPerminssionByUserId(u.getId()); ids = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(organizations)) { - for(Organization organization : organizations) { + if (CollectionUtils.isNotEmpty(organizations)) { + for (Organization organization : organizations) { ids.add(organization.getId()); } } else { FrontEndResult frontEndResult = new FrontEndResult(); - frontEndResult.setPageInfo(new PageInfo(0,0,0,10)); + frontEndResult.setPageInfo(new PageInfo(0, 0, 0, 10)); frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); - return frontEndResult; + return frontEndResult; } } - if(null != orgId) { + if (null != orgId) { ids = new ArrayList<>(); ids.add(orgId); } @@ -176,7 +174,7 @@ public class UsersController extends BaseController { List users = usersService.queryUsers2(usersQuery); List organizations = null; //设置用户角色信息 - for(Users user : users) { + for (Users user : users) { organizations = new ArrayList<>(); Organization organization = organizationService.getOrganization(user.getOrgId()); user.setOrganization(organization); @@ -199,13 +197,13 @@ public class UsersController extends BaseController { } //获取用户角色信息 - private List getUserRoles(Integer userId) { + private List getUserRoles(Integer userId) { UserRoleMapsQuery query = new UserRoleMapsQuery(); query.setUserId(userId); query.setYn(YnEnums.YES.getId()); List userRoleMapses = userRoleMapsService.queryUserRoleMaps(query); List roles = new ArrayList<>(); - for(UserRoleMaps roleMaps : userRoleMapses) { + for (UserRoleMaps roleMaps : userRoleMapses) { roles.add(rolesService.getRoles(roleMaps.getRoleId())); } return roles; @@ -232,33 +230,33 @@ public class UsersController extends BaseController { //code 不为空使用手机登录, password不为空时使用帐号登录 UsersQuery usersQuery = new UsersQuery(); usersQuery.setYn(YnEnums.YES.getId()); - if(null != code) { + if (null != code) { usersQuery.setPhone(account); } - if(null != password) { + if (null != password) { usersQuery.setAccount(account); } List users = usersService.queryUsers(usersQuery); - if(0 == users.size()) { + if (0 == users.size()) { ResultUtils.buildParameterErrorResultAndWrite(response, "该账户不存在"); return; } - if(!users.get(0).getEnable().equals(1)) { + if (!users.get(0).getEnable().equals(1)) { ResultUtils.buildParameterErrorResultAndWrite(response, "该账户已被禁用"); return; } LoginContext loginContext = new LoginContext(); loginContext.setErrormsg("服务器内部错误！"); - if(null != code) { - loginContext =LoginUtil.login(account, code, typeId, token); + if (null != code) { + loginContext = LoginUtil.login(account, code, typeId, token); } - if(null != password) { + if (null != password) { loginContext = LoginUtil.loginHospitalUser(account, password, typeId, token); } - if(null != loginContext && loginContext.getErrorcode().equals(0)) { + if (null != loginContext && loginContext.getErrorcode().equals(0)) { Users users1 = new Users(); users1.setId(users.get(0).getId()); users1.setLastLoginTime(new Date()); @@ -267,7 +265,7 @@ public class UsersController extends BaseController { Map result = new HashMap<>(); result.put("token", loginContext.getToken()); ResultUtils.buildSuccessResultAndWrite(response, result); - }else { + } else { ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.PARAMETER_ERROR, loginContext.getErrormsg()); } } @@ -285,7 +283,7 @@ public class UsersController extends BaseController { ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse); return; } - if(!phone.matches("^(((13[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1}))+\\d{8})$")) { + if (!phone.matches("^(((13[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1}))+\\d{8})$")) { ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse, "手机号不正确！"); return; } @@ -294,18 +292,18 @@ public class UsersController extends BaseController { usersQuery.setPhone(phone); usersQuery.setYn(YnEnums.YES.getId()); List list = usersService.queryUsers(usersQuery); - if(null == list || 0 == list.size()) { + if (null == list || 0 == list.size()) { ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse, "该账户不存在"); return; } - if(!list.get(0).getEnable().equals(1)) { + if (!list.get(0).getEnable().equals(1)) { ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse, "该账户已被禁用"); return; } LoginContext loginContext = LoginUtil.sendVerCode(phone, typeId, token); - if(null != loginContext) { + if (null != loginContext) { ResultUtils.buildResultAndWrite(httpServletResponse, loginContext.getErrorcode(), loginContext.getErrormsg()); return; } @@ -322,14 +320,14 @@ public class UsersController extends BaseController { public void usersLoginMsg(HttpServletResponse response, HttpServletRequest request) { LoginContext loginContext = (LoginContext) request.getAttribute("loginContext"); Users users = null; - if(null != loginContext) { + if (null != loginContext) { users = usersService.getUsers(loginContext.getId()); } List permissions = null; List roles = new ArrayList<>(); //超级管理员拥有所有角色和权限 - if(users.getType().equals(UserTypeEnum.SUPPER_ADMIN.getId())) { + if (users.getType().equals(UserTypeEnum.SUPPER_ADMIN.getId())) { RolesQuery rolesQuery = new RolesQuery(); rolesQuery.setYn(YnEnums.YES.getId()); roles = rolesService.queryRoles(rolesQuery); @@ -341,16 +339,16 @@ public class UsersController extends BaseController { } //其他用户 - else if(users.getType().equals(UserTypeEnum.PLATFORM_ADMIN.getId()) || users.getType().equals(UserTypeEnum.NORMAL_USER.getId())){ + else if (users.getType().equals(UserTypeEnum.PLATFORM_ADMIN.getId()) || users.getType().equals(UserTypeEnum.NORMAL_USER.getId())) { //获取用户角色信息 UserRoleMapsQuery query = new UserRoleMapsQuery(); query.setUserId(users.getId()); query.setYn(YnEnums.YES.getId()); List userRoleMapses = userRoleMapsService.queryUserRoleList(query); - RolePermissionMapsQuery rolePermissionMapsQuery ; + RolePermissionMapsQuery rolePermissionMapsQuery; List permissionIds = new ArrayList<>(); - permissions = new ArrayList<>(); - for(Integer roleMaps : userRoleMapses) { + permissions = new ArrayList<>(); + for (Integer roleMaps : userRoleMapses) { roles.add(rolesService.getRoles(roleMaps)); //获取角色权限信息 @@ -371,14 +369,13 @@ public class UsersController extends BaseController { } } }*/ - - List local = permissionsService.queryPermissionByRoleIds(roleMaps); - if(CollectionUtils.isNotEmpty(local)){ - for(Permissions permissions1:local){ - if(!permissionIds.contains(permissions1.getId())) { - permissionIds.add(permissions1.getId()); - permissions.add(permissions1); - } + } + List local = permissionsService.queryPermissionByRoleIds(userRoleMapses); + if (CollectionUtils.isNotEmpty(local)) { + for (Permissions permissions1 : local) { + if (!permissionIds.contains(permissions1.getId())) { + permissionIds.add(permissions1.getId()); + permissions.add(permissions1); } } } @@ -386,14 +383,14 @@ public class UsersController extends BaseController { List organizations = new ArrayList<>(); - if(null != users.getOrgId() && UserTypeEnum.NORMAL_USER.getId().equals(users.getType())) { //普通用户 + if (null != users.getOrgId() && UserTypeEnum.NORMAL_USER.getId().equals(users.getType())) { //普通用户 Organization organization = organizationService.getOrganization(users.getOrgId()); organizations.add(organization); users.setOrganization(organization); } else if (UserTypeEnum.PLATFORM_ADMIN.getId().equals(users.getType())) { //管理员 - List list2 =accessPermissionFacade.findAccessPerminssionByUserId(users.getId()); - if(CollectionUtils.isNotEmpty(list2)){ - for(Organization organization:list2){ + List list2 = accessPermissionFacade.findAccessPerminssionByUserId(users.getId()); + if (CollectionUtils.isNotEmpty(list2)) { + for (Organization organization : list2) { organizations.add(organization); } } @@ -418,12 +415,12 @@ public class UsersController extends BaseController { @RequestMapping(value = "/users/userRole/{id}", method = RequestMethod.GET) @TokenRequired public void userRole(HttpServletResponse response, HttpServletRequest request, @PathVariable(value = "id") Integer id) { - UserRoleMapsQuery query = new UserRoleMapsQuery(); + UserRoleMapsQuery query = new UserRoleMapsQuery(); query.setUserId(id); query.setYn(YnEnums.YES.getId()); List userRoleMapses = userRoleMapsService.queryUserRoleMaps(query); List roles = new ArrayList<>(); - for(UserRoleMaps roleMaps : userRoleMapses) { + for (UserRoleMaps roleMaps : userRoleMapses) { roles.add(rolesService.getRoles(roleMaps.getRoleId())); } @@ -431,13 +428,12 @@ public class UsersController extends BaseController { } - /** * 管理员权限设置 */ @RequestMapping(value = "/adminPermissions", method = RequestMethod.POST) @TokenRequired - public void adminPermissions(HttpServletResponse response,@RequestParam(value = "userId") Integer userId, @RequestParam(value = "ids") String ids){ + public void adminPermissions(HttpServletResponse response, @RequestParam(value = "userId") Integer userId, @RequestParam(value = "ids") String ids) { if (ids == null) { ResultUtils.buildParameterErrorResultAndWrite(response); @@ -456,7 +452,7 @@ public class UsersController extends BaseController { return; } - if(!usersList.get(0).getType().equals(UserTypeEnum.PLATFORM_ADMIN.getId())) { + if (!usersList.get(0).getType().equals(UserTypeEnum.PLATFORM_ADMIN.getId())) { ResultUtils.buildParameterErrorResultAndWrite(response, "用户错误"); return; } @@ -465,8 +461,8 @@ public class UsersController extends BaseController { UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery(); userOrganizationMapsQuery.setUserId(userId); List userOrganizationMapsList = userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery); - if(0 < userOrganizationMapsList.size()) { - for(UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) { + if (0 < userOrganizationMapsList.size()) { + for (UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) { userOrganizationMaps.setYn(YnEnums.NO.getId()); userOrganizationMapsService.updateUserOrganizationMaps(userOrganizationMaps); } @@ -474,12 +470,12 @@ public class UsersController extends BaseController { //添加最新权限映射 String[] roleArrayIds = ids.split(","); - Users user = usersList.get(0); + Users user = usersList.get(0); UserOrganizationMaps userOrganizationMaps = null; Organization organization = null; for (String id : roleArrayIds) { organization = organizationService.getOrganization(Integer.valueOf(id)); - if(null != organization) { + if (null != organization) { userOrganizationMaps = new UserOrganizationMaps(); userOrganizationMaps.setUserId(user.getId()); userOrganizationMaps.setOrgId(Integer.valueOf(id)); @@ -498,7 +494,7 @@ public class UsersController extends BaseController { private Boolean isPhone(String phone) { - return phone.matches("^(((13[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1}))+\\d{8})$"); + return phone.matches("^(((13[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1}))+\\d{8})$"); } /** @@ -509,7 +505,7 @@ public class UsersController extends BaseController { public void addAdmin(HttpServletResponse response, HttpServletRequest request, @RequestParam(value = "name", required = false) String name, - @RequestParam(value = "account", required = false)String account, + @RequestParam(value = "account", required = false) String account, @RequestParam(value = "phone") String phone, @RequestParam(value = "enable", required = false) Integer enable, @RequestParam(value = "remarks", required = false) String remarks, @@ -522,7 +518,7 @@ public class UsersController extends BaseController { if (StringUtils.isBlank(roleIds) || - StringUtils.isBlank(name) || StringUtils.isBlank(phone) || null == user ) { + StringUtils.isBlank(name) || StringUtils.isBlank(phone) || null == user) { ResultUtils.buildParameterErrorResultAndWrite(response); return; } @@ -575,7 +571,7 @@ public class UsersController extends BaseController { //关联登录中心ID LoginContext loginContext = LoginUtil.register(phone, token, typeId); //0 成功 4009 已注册 - if(loginContext.getErrorcode().equals(0) || loginContext.getErrorcode().equals(4009)) { + if (loginContext.getErrorcode().equals(0) || loginContext.getErrorcode().equals(4009)) { users.setLogincenterId(loginContext.getId()); usersService.addUsers(users); @@ -584,7 +580,7 @@ public class UsersController extends BaseController { UserRoleMaps userRoleMaps = new UserRoleMaps(); String[] roleArrayIds = roleIds.split(","); - List user1 = usersService.queryUsers(usersQuery); + List user1 = usersService.queryUsers(usersQuery); for (String id : roleArrayIds) { Roles roles = rolesService.getRoles(Integer.valueOf(id)); if (roles == null || roles.getYn() == YnEnums.NO.getId()) { @@ -619,7 +615,7 @@ public class UsersController extends BaseController { @RequestParam(value = "deptId", required = false) Integer deptId, @RequestParam(value = "ksId", required = false) Integer ksId, @RequestParam(value = "name", required = false) String name, - @RequestParam(value = "account", required = false)String account, + @RequestParam(value = "account", required = false) String account, @RequestParam(value = "phone") String phone, @RequestParam(value = "enable", required = false) Integer enable, @RequestParam(value = "remarks", required = false) String remarks, @@ -631,7 +627,7 @@ public class UsersController extends BaseController { Users user = usersService.getUsers(loginState.getId()); - if ( StringUtils.isBlank(roleIds) || StringUtils.isBlank(phone) || null == user ) { + if (StringUtils.isBlank(roleIds) || StringUtils.isBlank(phone) || null == user) { ResultUtils.buildParameterErrorResultAndWrite(response); return; } @@ -641,7 +637,7 @@ public class UsersController extends BaseController { return; } - if(deptId == null && ksId == null) { + if (deptId == null && ksId == null) { ResultUtils.buildParameterErrorResultAndWrite(response, "deptId or ksId required"); return; } @@ -691,7 +687,7 @@ public class UsersController extends BaseController { //关联登录中心ID LoginContext loginContext = LoginUtil.register(phone, token, typeId); //0 成功 4009 已注册 - if(loginContext.getErrorcode().equals(0) || loginContext.getErrorcode().equals(4009)) { + if (loginContext.getErrorcode().equals(0) || loginContext.getErrorcode().equals(4009)) { users.setLogincenterId(loginContext.getId()); usersService.addUsers(users); @@ -699,7 +695,7 @@ public class UsersController extends BaseController { UserRoleMaps userRoleMaps = new UserRoleMaps(); String[] roleArrayIds = roleIds.split(","); - List user1 = usersService.queryUsers(usersQuery); + List user1 = usersService.queryUsers(usersQuery); for (String id : roleArrayIds) { Roles roles = rolesService.getRoles(Integer.valueOf(id)); if (roles == null || roles.getYn() == YnEnums.NO.getId()) { @@ -722,7 +718,6 @@ public class UsersController extends BaseController { } - // /** // * 添加用户信息 // */ @@ -827,21 +822,21 @@ public class UsersController extends BaseController { public void updateUsers(HttpServletResponse response, HttpServletRequest request, @PathVariable(value = "id") Integer id, - @RequestParam(value = "name",required = false) String name, - @RequestParam(value = "account",required = false)String account, - @RequestParam(value = "phone",required = false) String phone, - @RequestParam(value = "enable",required = false) Integer enable, - @RequestParam(value = "remarks",required = false) String remarks, - @RequestParam(value = "roleIds",required = false) String roleIds, - @RequestParam(value = "orgId",required = false) Integer orgId, - @RequestParam(value = "deptId",required = false) Integer deptId) { - - if(null == roleIds) { + @RequestParam(value = "name", required = false) String name, + @RequestParam(value = "account", required = false) String account, + @RequestParam(value = "phone", required = false) String phone, + @RequestParam(value = "enable", required = false) Integer enable, + @RequestParam(value = "remarks", required = false) String remarks, + @RequestParam(value = "roleIds", required = false) String roleIds, + @RequestParam(value = "orgId", required = false) Integer orgId, + @RequestParam(value = "deptId", required = false) Integer deptId) { + + if (null == roleIds) { ResultUtils.buildParameterErrorResultAndWrite(response, "roleIds不能为空"); return; } - if(!(null != enable && (1 == enable || 2 == enable))) { + if (!(null != enable && (1 == enable || 2 == enable))) { ResultUtils.buildParameterErrorResultAndWrite(response, "enable参数错误"); return; } @@ -852,7 +847,7 @@ public class UsersController extends BaseController { if (user != null) { Users users = usersService.getUsers(id); - if(null!=users.getOtherAccount()&&"1".equals(user.getOtherAccount()+"")){ + if (null != users.getOtherAccount() && "1".equals(user.getOtherAccount() + "")) { return; } //根据当前登录的用户判断是否 有管理员的权限 @@ -864,7 +859,7 @@ public class UsersController extends BaseController { writeJson(response, JsonUtil.obj2JsonString(map)); return; }*/ - if(null == users) { + if (null == users) { Map map = new HashMap<>(); map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR); map.put(ResultUtils.ERROR_MSG, "用户不存在"); @@ -874,7 +869,7 @@ public class UsersController extends BaseController { //修改了手机号,不能修改已存在的手机号 - if(!new Integer(1).equals(users.getOtherAccount()) && !phone.equals(users.getPhone())) { + if (!new Integer(1).equals(users.getOtherAccount()) && !phone.equals(users.getPhone())) { //检查账户是否存在 UsersQuery usersQuery = new UsersQuery(); usersQuery.setPhone(phone); @@ -891,7 +886,7 @@ public class UsersController extends BaseController { LoginContext loginContext = LoginUtil.register(phone, token, typeId); //0 成功 4009 已注册 - if(loginContext.getErrorcode().equals(0) || loginContext.getErrorcode().equals(4009)) { + if (loginContext.getErrorcode().equals(0) || loginContext.getErrorcode().equals(4009)) { users.setPhone(phone); users.setLogincenterId(loginContext.getId()); } else { @@ -912,22 +907,22 @@ public class UsersController extends BaseController { //如有角色,则对用户角色中间表先删除后新增 - if(null != roleIds) { + if (null != roleIds) { String[] roleArrayIds = roleIds.split(","); //判断角色是否有更新 Boolean flag = false; - if(null == users.getRoles()) flag = true; - if(!flag) { + if (null == users.getRoles()) flag = true; + if (!flag) { for (String s : roleArrayIds) { - for(Roles role : users.getRoles()) { - if(s.equals(role.getId().toString())) continue; + for (Roles role : users.getRoles()) { + if (s.equals(role.getId().toString())) continue; flag = true; } - if(flag) break; + if (flag) break; } } - if(flag) { + if (flag) { Integer _userId = users.getId(); UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery(); userRoleMapsQuery.setUserId(_userId); @@ -940,7 +935,7 @@ public class UsersController extends BaseController { UserRoleMaps userRoleMaps = new UserRoleMaps(); for (String tmp : roleArrayIds) { - if(StringUtils.isEmpty(tmp)){ + if (StringUtils.isEmpty(tmp)) { continue; } Roles roles = rolesService.getRoles(Integer.valueOf(tmp)); @@ -966,7 +961,7 @@ public class UsersController extends BaseController { */ @RequestMapping(value = "/users/enable", method = RequestMethod.POST) @TokenRequired - public void enableUsers(HttpServletResponse response,@RequestParam Integer id, @RequestParam Integer flag) { + public void enableUsers(HttpServletResponse response, @RequestParam Integer id, @RequestParam Integer flag) { //检查账户是否存在 @@ -980,10 +975,10 @@ public class UsersController extends BaseController { writeJson(response, JsonUtil.obj2JsonString(map)); return; } - Users users =null; - if(CollectionUtils.isNotEmpty(usersList)){ - users =usersList.get(0); - if(null!=users.getOtherAccount()&&"1".equals(users.getOtherAccount()+"")){ + Users users = null; + if (CollectionUtils.isNotEmpty(usersList)) { + users = usersList.get(0); + if (null != users.getOtherAccount() && "1".equals(users.getOtherAccount() + "")) { return; } } @@ -997,14 +992,12 @@ public class UsersController extends BaseController { } - - /** * 用户删除 */ @RequestMapping(value = "/users/{id}", method = RequestMethod.DELETE) @TokenRequired - public void deleteUsers(HttpServletResponse response,@PathVariable Integer id) { + public void deleteUsers(HttpServletResponse response, @PathVariable Integer id) { if (null == id) { ResultUtils.buildIdIsNull(response); return; @@ -1046,7 +1039,6 @@ public class UsersController extends BaseController { } - /** * 修改用户密码 */