From 24af3720db93d23caafd3c42f5a98c0731092e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=93=E7=84=B1?= Date: Mon, 5 Aug 2019 01:40:30 +0800 Subject: [PATCH] =?UTF-8?q?shiro=20cookie=E4=BC=98=E5=8C=96,=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E6=8E=88=E6=9D=83=E7=AD=89=E5=85=B6=E4=BB=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BssDeptController.java | 3 +- .../controller/BssEmployeeController.java | 5 ++- .../controller/BssPlatformController.java | 3 +- .../system/controller/LoginController.java | 1 - .../system/controller/RoleController.java | 35 ++++++++++++++++++ .../system/controller/UserController.java | 5 +++ .../templates/business/employee/index.html | 4 +- admin/src/main/resources/templates/main.html | 2 +- .../resources/templates/system/role/add.html | 6 +++ .../templates/system/role/detail.html | 4 ++ .../cwhelp/common/constant/AdminConst.java | 10 +++-- .../com/cwhelp/common/constant/RoleConst.java | 19 ++++++++++ .../com/cwhelp/common/enums/ResultEnum.java | 2 + .../exception/advice/ExceptionAdvice.java | 2 +- .../exception/interfaces/ResultInterface.java | 4 +- .../com/cwhelp/component/shiro/AuthRealm.java | 6 ++- .../component/shiro/ICSecurityUtils.java | 11 ++++++ .../com/cwhelp/component/shiro/ShiroUtil.java | 14 ++++++- .../component/shiro/config/AuditorConfig.java | 9 ++++- .../cwhelp/modules/system/domain/Role.java | 1 + .../system/repository/RoleRepository.java | 2 + .../system/repository/UserRepository.java | 8 ++++ .../modules/system/service/RoleService.java | 8 ++++ .../modules/system/service/UserService.java | 7 ++++ .../system/service/impl/RoleServiceImpl.java | 5 +++ .../system/service/impl/UserServiceImpl.java | 14 ++++++- sdoc/设计.docx | Bin 14157 -> 14169 bytes 27 files changed, 170 insertions(+), 20 deletions(-) create mode 100644 common/src/main/java/com/cwhelp/common/constant/RoleConst.java create mode 100644 component/shiro/src/main/java/com/cwhelp/component/shiro/ICSecurityUtils.java diff --git a/admin/src/main/java/com/cwhelp/admin/business/controller/BssDeptController.java b/admin/src/main/java/com/cwhelp/admin/business/controller/BssDeptController.java index 9063137..5555db3 100644 --- a/admin/src/main/java/com/cwhelp/admin/business/controller/BssDeptController.java +++ b/admin/src/main/java/com/cwhelp/admin/business/controller/BssDeptController.java @@ -1,6 +1,7 @@ package com.cwhelp.admin.business.controller; import com.cwhelp.admin.business.validator.BssDeptValid; +import com.cwhelp.common.constant.AdminConst; import com.cwhelp.common.enums.StatusEnum; import com.cwhelp.common.utils.EntityBeanUtil; import com.cwhelp.common.utils.ResultVoUtil; @@ -51,7 +52,7 @@ public class BssDeptController { .withMatcher("name", match -> match.contains()); User user = ShiroUtil.getSubject(); - if (1 != user.getBssPlatform().getId()) { + if (AdminConst.ADMIN_PLATFORM_ID != user.getBssPlatform().getId()) { matcher.withMatcher("bssPlatform.id",match -> match.contains()); BssPlatform bssPlatform = new BssPlatform(); bssPlatform.setId(user.getBssPlatform().getId()); diff --git a/admin/src/main/java/com/cwhelp/admin/business/controller/BssEmployeeController.java b/admin/src/main/java/com/cwhelp/admin/business/controller/BssEmployeeController.java index 78586ce..48c4982 100644 --- a/admin/src/main/java/com/cwhelp/admin/business/controller/BssEmployeeController.java +++ b/admin/src/main/java/com/cwhelp/admin/business/controller/BssEmployeeController.java @@ -2,6 +2,7 @@ package com.cwhelp.admin.business.controller; import com.cwhelp.admin.business.validator.BssEmployeeValid; +import com.cwhelp.common.constant.AdminConst; import com.cwhelp.common.enums.StatusEnum; import com.cwhelp.common.utils.EntityBeanUtil; import com.cwhelp.common.utils.ResultVoUtil; @@ -53,7 +54,7 @@ public class BssEmployeeController { User user = ShiroUtil.getSubject(); List bssDepts = null; - if (1 != user.getBssPlatform().getId()) { + if (AdminConst.ADMIN_PLATFORM_ID != user.getBssPlatform().getId()) { bssDepts = bssDeptService.findBssDeptByBssPlatformAndId(user.getBssPlatform()); } Page list = bssEmployeeService.getPageList(bssDepts,bssEmployee); @@ -99,7 +100,7 @@ public class BssEmployeeController { */ private List getBssDepts(User user, BssPlatform bssPlatform) { List bssDepts = null; - if (1 != user.getBssPlatform().getId()) { + if (AdminConst.ADMIN_PLATFORM_ID != user.getBssPlatform().getId()) { bssDepts = bssDeptService.findBssDeptByBssPlatformAndId(bssPlatform); } else { bssDepts = bssDeptService.findAll(); diff --git a/admin/src/main/java/com/cwhelp/admin/business/controller/BssPlatformController.java b/admin/src/main/java/com/cwhelp/admin/business/controller/BssPlatformController.java index 2061584..cde7421 100644 --- a/admin/src/main/java/com/cwhelp/admin/business/controller/BssPlatformController.java +++ b/admin/src/main/java/com/cwhelp/admin/business/controller/BssPlatformController.java @@ -1,6 +1,7 @@ package com.cwhelp.admin.business.controller; import com.cwhelp.admin.business.validator.BssPlatformValid; +import com.cwhelp.common.constant.AdminConst; import com.cwhelp.common.enums.ResultEnum; import com.cwhelp.common.enums.StatusEnum; import com.cwhelp.common.utils.EntityBeanUtil; @@ -52,7 +53,7 @@ public class BssPlatformController { .withMatcher("email", match -> match.contains()); User user = ShiroUtil.getSubject(); // 判定当前用户的 所属平台 1为系统平台 - if (1 != user.getBssPlatform().getId()) { + if (AdminConst.ADMIN_PLATFORM_ID != user.getBssPlatform().getId()) { matcher.withMatcher("id",match -> match.contains()); bssPlatform.setId(user.getBssPlatform().getId()); } diff --git a/admin/src/main/java/com/cwhelp/admin/system/controller/LoginController.java b/admin/src/main/java/com/cwhelp/admin/system/controller/LoginController.java index c3d517d..1380811 100644 --- a/admin/src/main/java/com/cwhelp/admin/system/controller/LoginController.java +++ b/admin/src/main/java/com/cwhelp/admin/system/controller/LoginController.java @@ -79,7 +79,6 @@ public class LoginController implements ErrorController { // 1.获取Subject主体对象 Subject subject = SecurityUtils.getSubject(); - // 2.封装用户数据 UsernamePasswordToken token = new UsernamePasswordToken(username, password); diff --git a/admin/src/main/java/com/cwhelp/admin/system/controller/RoleController.java b/admin/src/main/java/com/cwhelp/admin/system/controller/RoleController.java index 31f243c..f315724 100644 --- a/admin/src/main/java/com/cwhelp/admin/system/controller/RoleController.java +++ b/admin/src/main/java/com/cwhelp/admin/system/controller/RoleController.java @@ -2,6 +2,7 @@ package com.cwhelp.admin.system.controller; import com.cwhelp.admin.system.validator.RoleValid; import com.cwhelp.common.constant.AdminConst; +import com.cwhelp.common.constant.RoleConst; import com.cwhelp.common.enums.ResultEnum; import com.cwhelp.common.enums.StatusEnum; import com.cwhelp.common.exception.ResultException; @@ -14,17 +15,22 @@ import com.cwhelp.component.actionLog.action.StatusAction; import com.cwhelp.component.actionLog.annotation.ActionLog; import com.cwhelp.component.actionLog.annotation.EntityParam; import com.cwhelp.component.shiro.ShiroUtil; +import com.cwhelp.modules.business.domain.BssEmployee; import com.cwhelp.modules.system.domain.Menu; import com.cwhelp.modules.system.domain.Role; +import com.cwhelp.modules.system.domain.User; import com.cwhelp.modules.system.service.MenuService; import com.cwhelp.modules.system.service.RoleService; +import com.cwhelp.modules.system.service.UserService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Example; import org.springframework.data.domain.ExampleMatcher; import org.springframework.data.domain.Page; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -45,6 +51,8 @@ public class RoleController { @Autowired private MenuService menuService; + @Autowired + private UserService userService; /** * 列表页面 */ @@ -66,6 +74,33 @@ public class RoleController { return "/system/role/index"; } + /** + * 跳转到角色分配页面 + */ + @GetMapping("/rolePage") + @RequiresPermissions("system:user:role") + public String toRole(@RequestParam(value = "ids") BssEmployee bssEmployee, Model model) { + User user = userService.getByName(bssEmployee.getPhoneNum()); + if (ObjectUtils.isEmpty(user)) { + throw new ResultException(ResultEnum.USER_NOE_EXIST); + } + // 获取指定用户角色列表 + Set authRoles = user.getRoles(); + Sort sort = new Sort(Sort.Direction.ASC, "createDate"); + List list = null; + //如果当前用户是超级用户 + if (user.getId() == AdminConst.ADMIN_ID) { + list = roleService.getListBySortOk(sort); + } else { + list = roleService.getListByType(sort, RoleConst.ROLE_ORDINARY_TYPE); + } + + model.addAttribute("id", user.getId()); + model.addAttribute("list", list); + model.addAttribute("authRoles", authRoles); + return "/system/user/role"; + } + /** * 跳转到添加页面 */ diff --git a/admin/src/main/java/com/cwhelp/admin/system/controller/UserController.java b/admin/src/main/java/com/cwhelp/admin/system/controller/UserController.java index 6a14ebc..ccd2588 100644 --- a/admin/src/main/java/com/cwhelp/admin/system/controller/UserController.java +++ b/admin/src/main/java/com/cwhelp/admin/system/controller/UserController.java @@ -155,6 +155,11 @@ public class UserController { throw new ResultException(ResultEnum.USER_EXIST); } + // 判断手机号码是否重复 + if (userService.repeatByPhone(user)) { + throw new ResultException(ResultEnum.USER_PHONE_EXIST); + } + // 复制保留无需修改的数据 if (user.getId() != null) { // 不允许操作超级管理员数据 diff --git a/admin/src/main/resources/templates/business/employee/index.html b/admin/src/main/resources/templates/business/employee/index.html index 2aa5ae0..f191999 100644 --- a/admin/src/main/resources/templates/business/employee/index.html +++ b/admin/src/main/resources/templates/business/employee/index.html @@ -38,13 +38,14 @@
+
启用
冻结
删除
-
授权
@@ -88,7 +89,6 @@ 编辑 详细 删除 - 授权 diff --git a/admin/src/main/resources/templates/main.html b/admin/src/main/resources/templates/main.html index e6e1017..8f40104 100644 --- a/admin/src/main/resources/templates/main.html +++ b/admin/src/main/resources/templates/main.html @@ -54,7 +54,7 @@ 头像
-

TIMO

+

在线

diff --git a/admin/src/main/resources/templates/system/role/add.html b/admin/src/main/resources/templates/system/role/add.html index 158c81b..4dfab7e 100644 --- a/admin/src/main/resources/templates/system/role/add.html +++ b/admin/src/main/resources/templates/system/role/add.html @@ -18,6 +18,12 @@ +
+ +
+ +
+
diff --git a/admin/src/main/resources/templates/system/role/detail.html b/admin/src/main/resources/templates/system/role/detail.html index 55408ab..bdc9464 100644 --- a/admin/src/main/resources/templates/system/role/detail.html +++ b/admin/src/main/resources/templates/system/role/detail.html @@ -13,6 +13,10 @@ 角色编号名称 [[${role.title}]]（[[${role.name}]]） + + 角色类型 + + 创建用户 diff --git a/common/src/main/java/com/cwhelp/common/constant/AdminConst.java b/common/src/main/java/com/cwhelp/common/constant/AdminConst.java index e9817e9..25d111d 100644 --- a/common/src/main/java/com/cwhelp/common/constant/AdminConst.java +++ b/common/src/main/java/com/cwhelp/common/constant/AdminConst.java @@ -9,21 +9,23 @@ public class AdminConst { /** * 超级管理员id */ - public static Long ADMIN_ID = 1L; + public static final Long ADMIN_ID = 1L; /** * 超级管理员用户名 */ - public static String ADMIN_NAME = "admin"; + public static final String ADMIN_NAME = "admin"; /** * 超级管理员角色id */ - public static Long ADMIN_ROLE_ID = 1L; + public static final Long ADMIN_ROLE_ID = 1L; /** * 超级管理员角色标识名称 */ - public static String ADMIN_ROLE_NAME = "admin"; + public static final String ADMIN_ROLE_NAME = "admin"; + + public static final Long ADMIN_PLATFORM_ID = 1L; } diff --git a/common/src/main/java/com/cwhelp/common/constant/RoleConst.java b/common/src/main/java/com/cwhelp/common/constant/RoleConst.java new file mode 100644 index 0000000..3fcef80 --- /dev/null +++ b/common/src/main/java/com/cwhelp/common/constant/RoleConst.java @@ -0,0 +1,19 @@ +package com.cwhelp.common.constant; + +/** + * @author: yan.y + * @Description: + * @Date: Created in 1:12 2019/8/5 + */ +public class RoleConst { + + /** + * 角色平台类型 + */ + public static final String ROLE_PLATFORM_TYPE = "1"; + + /** + * 角色普通类型 + */ + public static final String ROLE_ORDINARY_TYPE = "2"; +} diff --git a/common/src/main/java/com/cwhelp/common/enums/ResultEnum.java b/common/src/main/java/com/cwhelp/common/enums/ResultEnum.java index a63bbc3..7d4b97d 100644 --- a/common/src/main/java/com/cwhelp/common/enums/ResultEnum.java +++ b/common/src/main/java/com/cwhelp/common/enums/ResultEnum.java @@ -26,6 +26,8 @@ public enum ResultEnum implements ResultInterface { USER_NAME_PWD_NULL(405, "用户名和密码不能为空"), USER_CAPTCHA_ERROR(406, "验证码错误"), USER_PWD_STRENGTH_ERROR(407, "密码强度不够"), + USER_PHONE_EXIST(408, "该用户手机号码已经存在"), + USER_NOE_EXIST(409, "该用户不存在"), /** * 平台 diff --git a/common/src/main/java/com/cwhelp/common/exception/advice/ExceptionAdvice.java b/common/src/main/java/com/cwhelp/common/exception/advice/ExceptionAdvice.java index 07d117b..9da6475 100644 --- a/common/src/main/java/com/cwhelp/common/exception/advice/ExceptionAdvice.java +++ b/common/src/main/java/com/cwhelp/common/exception/advice/ExceptionAdvice.java @@ -5,5 +5,5 @@ package com.cwhelp.common.exception.advice; * @author yan.y */ public interface ExceptionAdvice { - public void run(RuntimeException e); + void run(RuntimeException e); } diff --git a/common/src/main/java/com/cwhelp/common/exception/interfaces/ResultInterface.java b/common/src/main/java/com/cwhelp/common/exception/interfaces/ResultInterface.java index 614e1be..cab7a36 100644 --- a/common/src/main/java/com/cwhelp/common/exception/interfaces/ResultInterface.java +++ b/common/src/main/java/com/cwhelp/common/exception/interfaces/ResultInterface.java @@ -6,8 +6,8 @@ package com.cwhelp.common.exception.interfaces; */ public interface ResultInterface { - public Integer getCode(); + Integer getCode(); - public String getMessage(); + String getMessage(); } diff --git a/component/shiro/src/main/java/com/cwhelp/component/shiro/AuthRealm.java b/component/shiro/src/main/java/com/cwhelp/component/shiro/AuthRealm.java index a7578b1..6e37412 100644 --- a/component/shiro/src/main/java/com/cwhelp/component/shiro/AuthRealm.java +++ b/component/shiro/src/main/java/com/cwhelp/component/shiro/AuthRealm.java @@ -36,8 +36,10 @@ public class AuthRealm extends AuthorizingRealm { @Override protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principal) { SimpleAuthorizationInfo info = new SimpleAuthorizationInfo(); + + Long userId = (Long) principal.getPrimaryPrincipal(); // 获取用户Principal对象 - User user = (User) principal.getPrimaryPrincipal(); + User user = userService.getById(userId); // 管理员拥有所有权限 if(user.getId().equals(AdminConst.ADMIN_ID)){ @@ -85,7 +87,7 @@ public class AuthRealm extends AuthorizingRealm { * 参数3：加盐处理 * 参数4：固定写法 */ - return new SimpleAuthenticationInfo(user, user.getPassword(), salt, getName()); + return new SimpleAuthenticationInfo(user.getId(), user.getPassword(), salt, getName()); } /** diff --git a/component/shiro/src/main/java/com/cwhelp/component/shiro/ICSecurityUtils.java b/component/shiro/src/main/java/com/cwhelp/component/shiro/ICSecurityUtils.java new file mode 100644 index 0000000..c4f859c --- /dev/null +++ b/component/shiro/src/main/java/com/cwhelp/component/shiro/ICSecurityUtils.java @@ -0,0 +1,11 @@ +package com.cwhelp.component.shiro; + +import org.apache.shiro.SecurityUtils; + +/** + * @author: yan.y + * @Description: + * @Date: Created in 0:28 2019/8/5 + */ +public class ICSecurityUtils extends SecurityUtils { +} diff --git a/component/shiro/src/main/java/com/cwhelp/component/shiro/ShiroUtil.java b/component/shiro/src/main/java/com/cwhelp/component/shiro/ShiroUtil.java index d9adc33..61ef253 100644 --- a/component/shiro/src/main/java/com/cwhelp/component/shiro/ShiroUtil.java +++ b/component/shiro/src/main/java/com/cwhelp/component/shiro/ShiroUtil.java @@ -4,10 +4,13 @@ import com.cwhelp.common.utils.EncryptUtil; import com.cwhelp.common.utils.SpringContextUtil; import com.cwhelp.modules.system.domain.Role; import com.cwhelp.modules.system.domain.User; +import com.cwhelp.modules.system.service.UserService; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.SimpleAuthenticationInfo; import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.mgt.RememberMeManager; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; import java.util.Set; @@ -15,8 +18,16 @@ import java.util.Set; * Shiro工具类 * @author yan.y */ +@Component public class ShiroUtil { + private static UserService userService; + + @Autowired + public void setUserService(UserService userService){ + ShiroUtil.userService = userService; + } + /** * 加密算法 */ @@ -49,7 +60,8 @@ public class ShiroUtil { * 获取ShiroUser对象 */ public static User getSubject(){ - return (User) SecurityUtils.getSubject().getPrincipal(); + Long userId = (Long) SecurityUtils.getSubject().getPrincipal(); + return userService.getById(userId); } /** diff --git a/component/shiro/src/main/java/com/cwhelp/component/shiro/config/AuditorConfig.java b/component/shiro/src/main/java/com/cwhelp/component/shiro/config/AuditorConfig.java index 96c6e8e..6a6dcb4 100644 --- a/component/shiro/src/main/java/com/cwhelp/component/shiro/config/AuditorConfig.java +++ b/component/shiro/src/main/java/com/cwhelp/component/shiro/config/AuditorConfig.java @@ -1,8 +1,10 @@ package com.cwhelp.component.shiro.config; import com.cwhelp.modules.system.domain.User; +import com.cwhelp.modules.system.service.UserService; import org.apache.shiro.SecurityUtils; import org.apache.shiro.subject.Subject; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.data.domain.AuditorAware; @@ -14,10 +16,15 @@ import java.util.Optional; */ @Configuration public class AuditorConfig implements AuditorAware { + + @Autowired + private UserService userService; + @Override public Optional getCurrentAuditor() { Subject subject = SecurityUtils.getSubject(); - User user = (User) subject.getPrincipal(); + Long userId = (Long) subject.getPrincipal(); + User user = userService.getById(userId); return Optional.ofNullable(user); } } diff --git a/modules/system/src/main/java/com/cwhelp/modules/system/domain/Role.java b/modules/system/src/main/java/com/cwhelp/modules/system/domain/Role.java index d47d858..1ecd97a 100644 --- a/modules/system/src/main/java/com/cwhelp/modules/system/domain/Role.java +++ b/modules/system/src/main/java/com/cwhelp/modules/system/domain/Role.java @@ -37,6 +37,7 @@ public class Role implements Serializable { private Long id; private String name; private String title; + private String type; private String remark; @CreatedDate private Date createDate; diff --git a/modules/system/src/main/java/com/cwhelp/modules/system/repository/RoleRepository.java b/modules/system/src/main/java/com/cwhelp/modules/system/repository/RoleRepository.java index 7827020..190c69a 100644 --- a/modules/system/src/main/java/com/cwhelp/modules/system/repository/RoleRepository.java +++ b/modules/system/src/main/java/com/cwhelp/modules/system/repository/RoleRepository.java @@ -26,6 +26,8 @@ public interface RoleRepository extends BaseRepository { */ List findAllByStatus(Sort sort, Byte status); + List findAllByType(Sort sort, String type); + /** * 查询指定用户的角色列表 * @param id 用户ID diff --git a/modules/system/src/main/java/com/cwhelp/modules/system/repository/UserRepository.java b/modules/system/src/main/java/com/cwhelp/modules/system/repository/UserRepository.java index 64d94ce..a38fa15 100644 --- a/modules/system/src/main/java/com/cwhelp/modules/system/repository/UserRepository.java +++ b/modules/system/src/main/java/com/cwhelp/modules/system/repository/UserRepository.java @@ -26,6 +26,14 @@ public interface UserRepository extends BaseRepository, JpaSpecifica */ User findByUsernameAndIdNot(String username, Long id); + /** + * 根据手机号码查询用户数据,且排查指定ID的用户 + * @param phone 用户手机号码 + * @param id 排除的用户ID + * @return 用户数据 + */ + User findByPhoneAndIdNot(String phone, Long id); + /** * 查找多个相应部门的用户列表 */ diff --git a/modules/system/src/main/java/com/cwhelp/modules/system/service/RoleService.java b/modules/system/src/main/java/com/cwhelp/modules/system/service/RoleService.java index a13c450..e61c11e 100644 --- a/modules/system/src/main/java/com/cwhelp/modules/system/service/RoleService.java +++ b/modules/system/src/main/java/com/cwhelp/modules/system/service/RoleService.java @@ -42,6 +42,14 @@ public interface RoleService { */ Page getPageList(Example example); + /** + * 查询列表 + * @param sort + * @param type + * @return + */ + List getListByType(Sort sort, String type); + /** * 获取角色列表数据 * @param sort 排序对象 diff --git a/modules/system/src/main/java/com/cwhelp/modules/system/service/UserService.java b/modules/system/src/main/java/com/cwhelp/modules/system/service/UserService.java index 84f429e..6aecffa 100644 --- a/modules/system/src/main/java/com/cwhelp/modules/system/service/UserService.java +++ b/modules/system/src/main/java/com/cwhelp/modules/system/service/UserService.java @@ -45,6 +45,13 @@ public interface UserService { */ Boolean repeatByUsername(User user); + /** + * 手机号码是否重复 + * @param user 用户对象 + * @return 用户数据 + */ + Boolean repeatByPhone(User user); + /** * 根据用户ID查询用户数据 * @param id 用户ID diff --git a/modules/system/src/main/java/com/cwhelp/modules/system/service/impl/RoleServiceImpl.java b/modules/system/src/main/java/com/cwhelp/modules/system/service/impl/RoleServiceImpl.java index 2d1a104..6e780a2 100644 --- a/modules/system/src/main/java/com/cwhelp/modules/system/service/impl/RoleServiceImpl.java +++ b/modules/system/src/main/java/com/cwhelp/modules/system/service/impl/RoleServiceImpl.java @@ -68,6 +68,11 @@ public class RoleServiceImpl implements RoleService { return roleRepository.findAll(example, page); } + @Override + public List getListByType(Sort sort, String type) { + return roleRepository.findAllByType(sort, type); + } + /** * 获取角色列表数据 * @param sort 排序对象 diff --git a/modules/system/src/main/java/com/cwhelp/modules/system/service/impl/UserServiceImpl.java b/modules/system/src/main/java/com/cwhelp/modules/system/service/impl/UserServiceImpl.java index fca61f9..1f673b0 100644 --- a/modules/system/src/main/java/com/cwhelp/modules/system/service/impl/UserServiceImpl.java +++ b/modules/system/src/main/java/com/cwhelp/modules/system/service/impl/UserServiceImpl.java @@ -1,5 +1,6 @@ package com.cwhelp.modules.system.service.impl; +import com.cwhelp.common.constant.AdminConst; import com.cwhelp.common.data.PageSort; import com.cwhelp.common.enums.StatusEnum; import com.cwhelp.modules.business.domain.BssPlatform; @@ -57,6 +58,17 @@ public class UserServiceImpl implements UserService { return userRepository.findByUsernameAndIdNot(user.getUsername(), id) != null; } + /** + * 手机号码是否存在 + * @param user 用户对象 + * @return 用户数据 + */ + @Override + public Boolean repeatByPhone(User user) { + Long id = user.getId() != null ? user.getId() : Long.MIN_VALUE; + return userRepository.findByPhoneAndIdNot(user.getPhone(), id) != null; + } + /** * 根据用户ID获取用户信息 * @param id 用户ID @@ -96,7 +108,7 @@ public class UserServiceImpl implements UserService { preList.add(in); } // 1 为财务帮平台超级账号 - if (1 != user.getBssPlatform().getId()) { + if (AdminConst.ADMIN_PLATFORM_ID != user.getBssPlatform().getId()) { BssPlatform bssPlatform = user.getBssPlatform(); Join join = root.join("bssPlatform", JoinType.INNER); Predicate eq = cb.equal(join.get("id").as(Long.class),bssPlatform.getId()); diff --git a/sdoc/设计.docx b/sdoc/设计.docx index 337913985e8b32bf797f42f1fc0e2dc4ab332543..34a77a0bcc89fd050b1741ca6a9f629e9e603dc0 100644 GIT binary patch delta 4868 zcmai2WmweTww|H8K}tYLfuR|?OHxWgz@bZE=!PF9BOQYb2qIn5DV+m~(jg@cf;317 z0+;_e=eg&8yI?hI3u#oqsP>f6m|YfnQ`V|7Z^^GJ zzL=+K#}?B3agFGgC?K{a$zXJ{0Tm#|H-W5Y&p!j&h`YACS0vl#i!&|x6>5R*B*E=Q z<*V^8zKhQtdLFLN3_VIzG6ph=Pmiq_x)M|8G-=o-18CyakU}PdNVYc|bGD2{dTF+= z;-eL28{c6{Ik{E;5RIO&I9r1J0qbgFVo`xWAUqI4XHC9~{cXD*7z7H&0D;Kwy|!>0 zK-UxQ?!|8d_q5~lcXfH4YVoR%g(~_G_nNflTG@4QUOlyrlpvBC=j-g?`)wzlIQprx z_2tn*rwK!;o*nP5t(Gx}J}>Uz0hfL&+MX9&4Z}@V$Es0kD>xDAwCnh| zRmw;n_%>BtlHT}t1Ubd`pv0uA+h9WJnhKukA|us5EB-ZAjU*b^yrLIY;)6gT_1RcWn7}^NhS7j%JKg4BNyfk>Z`OHdC+}``|BkIM;X;05w>89{*LW|{2unkylrhmBs{50ypWj; zP9Mh`OH&CD#1af9hIO~qtm?srE;P6t8}t)y8cuc77Tz;iO~fdlumS!pq!FqogyP{E z?O_iDi;r$daM2;kM{XJ0R=ypk9@y(tuxS1U9y%4zVI?VaGB@hU+&B$=@}|&Bh$;8P z>O)^W9ou8KIcNXh*LWOGWOn15;BTN9>7atz@27Q)rFTE8gU_p1L%eR>gVsZ$YO`%A z4e|^U2I&_@vC#!}VL6^mvMAHr5jmC*ht~%d!bCpY3}8l(lnFkh z(nlcIi2w2gN2Jf+8&#cffJrceOkGH2RTP|wD3@aKBUb>bo4r%w3*Y@Dw@A-1Ci2!R zrQPmjDUjCD*XN|e&|s#+@O+?WU*3Wlah#b?6{`QZFs?>{ldxKWGp_P}txzaQ;O>bp zR~;eKs&LMw{8r69Hr(xX?Y;l9qZvoiw3A`s%gK*iEaDxBGz%1P&fyy1>%VbYaCy4JcubYRPvEc%*azj9C}=A3e?lMVX3 zbhFZMyVD%%TH1m`mS>P9J*BL)om}s4!vJm)*pC%UN7Lk591qmZ=1;OOnefH?+q7h( z88kO|mrNcz91l=P#EGSUHf>K)b_3QD*lWuaE4|Ft5;p6cl!m9N;Jhi?OwRem{;VwVtlEk4 zx$h7Mk#Ac|u&Y%8N;KPR&1sJZJpY5KR(a$;-IL}XMg2X3#eN3O2y!?tN}Iu1+x4E= zXAV+PJ%fAb2Wtu0=WAR`CNySYzG#N8)^R$hd!7RKJpPky6Z3yat5USYh^1q(-d{%+ zbn4ywe`pf@i{~PmLE__>9`ZdQACj4f3V*u0g!b*&FdnKL``Ch=?{=Te=5!1ARK@+P-q2FubX;IwEA-tq9^BU zQ!s~7T1QmV4&8s(DlOhMiLjR!Jeh^8F@0;a9KPAo@~EwH4+_cySGl>~dX+@W(n+LtC7`UVTuZ(Xi&v zyDk1zGzNXBpVF~zndk~Co#GO~_Shc%Kj|?#Wh6z`+RkJO?K##DcHd@x zLt2rr;6KgbOz*$~fx7EsNkTD!QTKzA_Y|;eS&p}c?cKpy$ z%qdK-`TN`YtBX-Gvj_gn%mU5N9PAFS2g-U5NuJpmZwo$hjAqjez7Fl~O}IK!r;m&b z322HL@UxVXcKaM!1U{6r-x5+1GZ{i~LbbUR6NxF}W*uI}ixF z#Z9J1%JAdY2U5!6V3!WBpM=+U(w$-h+G}h6^U2=W&m`I_JO~oI@$sd`*gc)zc!XRO z{g!ypr5OCOu>q)$ux2Z=BWO7{xEeZ8f1Q93qhGs?zxD3pl~t=}*Iyo5N=l9*Gws#@ z>UDI>w%nedFO5l9n^8MD8Z8 zYWgGBa`Kk1^kA-sQ^c&O#&=7+H|9^e#Nvbna I%J2ASUpG$~EoUrGdkHs%hW)YK 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 JM&W;S{{_Av9UK4v