server/platform/src/main/java/com/doumee/api/system/SystemRoleController.java
@@ -5,8 +5,10 @@ import com.doumee.core.annotation.pr.PreventRepeat; import com.doumee.core.constants.OperaType; import com.doumee.core.model.ApiResponse; import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.dao.system.dto.CreateRoleMenuDTO; import com.doumee.dao.system.dto.CreateRolePermissionDTO; import com.doumee.dao.system.dto.QuerySystemRoleDTO; @@ -104,7 +106,9 @@ @GetMapping("/all") @RequiresPermissions("system:role:query") public ApiResponse<List<SystemRole>> findAll () { LoginUserInfo loginUser = getLoginUser(); SystemRole systemRole = new SystemRole(); systemRole.setType(loginUser.getType()); systemRole.setDeleted(Boolean.FALSE); return ApiResponse.success(systemRoleService.findList(systemRole)); } server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -112,6 +112,7 @@ SystemUser queryUserDto = new SystemUser(); queryUserDto.setUsername(systemUser.getUsername()); queryUserDto.setDeleted(Boolean.FALSE); queryUserDto.setType(Constants.ZERO); SystemUser user = systemUserService.findOne(queryUserDto); if (user != null) { throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "登录账号已存在"); server/service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java
@@ -2,8 +2,10 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Utils; import com.doumee.dao.system.SystemRoleMapper; import com.doumee.dao.system.dto.QuerySystemRoleDTO; import com.doumee.dao.system.model.SystemRole; @@ -13,12 +15,14 @@ import com.doumee.service.system.SystemRoleService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.List; import java.util.Objects; /** * 系统角色Service实现 @@ -95,11 +99,15 @@ Wrapper<SystemRole> wrapper = new QueryWrapper<>(systemRole); return systemRoleMapper.selectList(wrapper); } @Override public PageData<SystemRoleListVO> findPage(PageWrap<QuerySystemRoleDTO> pageWrap) { LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); Utils.MP.blankToNull(pageWrap.getModel()); QuerySystemRoleDTO model = pageWrap.getModel(); model.setType(Objects.nonNull(model.getType()) ? model.getType() : principal.getType()); PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity()); List<SystemRoleListVO> roleList = systemRoleMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause()); List<SystemRoleListVO> roleList = systemRoleMapper.selectManageList(model, pageWrap.getOrderByClause()); for (SystemRoleListVO role : roleList) { role.setMenus(systemMenuService.findByRoleId(role.getId())); role.setPermissions(systemPermissionService.findByRoleId(role.getId())); server/service/src/main/resources/mappers/SystemMenuMapper.xml
@@ -20,7 +20,7 @@ create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME, update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME FROM SYSTEM_MENU menu JOIN `SYSTEM_USER` create_user ON create_user.ID = menu.CREATE_USER LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = menu.CREATE_USER LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = menu.UPDATE_USER <where> menu.DELETED = 0 and menu.type = #{type} server/service/src/main/resources/mappers/SystemRoleMapper.xml
@@ -30,7 +30,7 @@ <if test="dto.name != null and dto.name != ''"> AND role.`NAME` LIKE CONCAT('%', #{dto.name}, '%') </if> <if test="dto.type != null and dto.type != ''"> <if test="dto.type != null"> AND role.type = #{dto.type} </if> </where>
