diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MallPermissionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/MallPermissionController.java index d449f0a67..6b7369850 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MallPermissionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/MallPermissionController.java @@ -71,5 +71,12 @@ public class MallPermissionController extends BaseController { return new ResultData(Result.SUCCESS, "成功", null); } + @GetMapping("/findByParentId") + @SystemControllerLog(description = "用户管理-子权限查找") + public ResultData findByParentId(Long id) { + logger.debug("[" + getIpAddr() + "] MallPermissionController::findByParentId"); + return new ResultData(Result.SUCCESS, "成功", mallPermissionService.getByParentId(id)); + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java index 4c98eba19..06f577d8d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java @@ -56,6 +56,19 @@ public class MallPermission implements Serializable { @io.swagger.annotations.ApiModelProperty(value="排序",name="sort") private Integer sort; + @Transient + private Integer sortFrom; + @Transient + private Integer sortTo; + @Transient + private Integer sortGte; + @Transient + private Integer sortGt; + @Transient + private Integer sortLte; + @Transient + private Integer sortLt; + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/service/MallPermissionService.java b/mallinkService/src/main/java/com/iformall/service/MallPermissionService.java index 69505f059..5e6adec43 100644 --- a/mallinkService/src/main/java/com/iformall/service/MallPermissionService.java +++ b/mallinkService/src/main/java/com/iformall/service/MallPermissionService.java @@ -11,8 +11,8 @@ public interface MallPermissionService { * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(MallPermission record, Integer pageIndex, Integer pageSize); @@ -24,6 +24,14 @@ public interface MallPermissionService { * @return */ MallPermission getById(Long id); + + /** + * 根据parentId获得列表 + * + * @param parentId + * @return + */ + List getByParentId(Long parentId); /** * 保存或更新实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java index e9a931811..e74912ee1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java @@ -31,6 +31,17 @@ public class MallPermissionServiceImpl implements MallPermissionService { return mallPermissionMapper.selectByPrimaryKey(id); } + @Override + public List getByParentId(Long parentId) { + if(parentId == null) { + parentId = 0L; + } + MallPermission mpQ = new MallPermission(); + mpQ.setParentId(parentId); + mpQ.setSortColumns(MallPermission.Field.Sort_ASC); + return mallPermissionMapper.findList(mpQ); + } + @Override public void saveOrUpdate(MallPermission record) { if (record.getId() == null) { diff --git a/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml b/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml index 7285671b3..b37ff430b 100644 --- a/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml @@ -1,99 +1,93 @@ - - - - - - - - - - - - - - `id`,`name`,`available`,`parent_id`,`parent_ids`,`permission`,`resource_type`,`url`,`sort` + + + + + + + + + + + + + + + + + `id`,`name`,`parent_id`,`available`,`permission`,`resource_type`,`module_color`,`module_color_num`,`url`,`icon`,`sort` - - where 1 = 1 - - - and `id` = #{id} - - + + where 1 = 1 + + + and `id` = #{id} + + + + and `name` = #{name} + + + and `name` like concat('%', #{nameLike},'%') + + + + and `parent_id` = #{parentId} + + + + and `available` like concat('%', #{available},'%') + + + + and `permission` like concat('%', #{permission},'%') + + + and `permission` in + + #{item_permission} + + + + + and `resource_type` like concat('%', #{resourceType},'%') + + + + and `url` = #{url} + + + + and `icon` = #{icon} + + + + and `sort` = #{sort} + + and `sort` >= #{sortFrom} + and #{sortTo} >= `sort` + and `sort` >= #{sortGte} + and `sort` > #{sortGt} + and #{sortLte} >= `sort` + and #{sortLt} > `sort` + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + - - and `name` like concat('%', #{name},'%') - - - and `name` like concat('%', #{nameLike},'%') - - - and `available` like concat('%', #{available},'%') - - - - - and `parent_id` = #{parentId} - - - - - and `parent_ids` like concat('%', #{parentIds},'%') - - - - - and `permission` like concat('%', #{permission},'%') - - - - and `permission` in - - #{item_permission} - - - - - and `resource_type` like concat('%', #{resourceType},'%') - - - - - and `url` like concat('%', #{url},'%') - - - - - and `sort` = #{sort} - - - and `sort` >= #{sortFrom} - and #{sortTo} >= `sort` - and `sort` >= #{sortGte} - and `sort` > #{sortGt} - and #{sortLte} >= `sort` - and #{sortLt} > `sort` - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - - - -