Commit 5906a809 authored by lijiazhi's avatar lijiazhi
Browse files

bug fix for beetlsql3

parent bb5bf585
......@@ -10,6 +10,7 @@ import org.beetl.sql.core.page.PageResult;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.Root;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.beetl.sql.mapper.annotation.Update;
/**
* CoreDict Dao
......@@ -17,5 +18,6 @@ import org.beetl.sql.mapper.annotation.SqlResource;
@SqlResource("console.dict")
public interface DictConsoleDao extends BaseMapper<CoreDict> {
PageResult<CoreDict> queryByCondition(PageRequest query, @Root Map params);
@Update
void batchDelCoreDictByIds( List<Long> ids);
}
\ No newline at end of file
......@@ -12,6 +12,7 @@ import org.beetl.sql.core.page.PageResult;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.Root;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.beetl.sql.mapper.annotation.Update;
@SqlResource("console.role")
public interface RoleConsoleDao extends BaseMapper<CoreRole> {
......@@ -26,10 +27,13 @@ public interface RoleConsoleDao extends BaseMapper<CoreRole> {
* 批量删除角色
* @param ids 角色id
*/
@Update
void batchDelByIds(List<Long> ids);
@Update
void batchDeleteRoleFunction(List<Long> ids);
@Update
void batchDeleteRoleMenu(List<Long> ids);
@Update
void batchDeleteUserRole(List<Long> ids);
......
......@@ -6,11 +6,12 @@ import com.ibeetl.admin.console.web.dto.RoleDataAccessFunction;
import com.ibeetl.admin.core.entity.CoreRoleFunction;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.beetl.sql.mapper.annotation.Update;
@SqlResource("console.roleFunction")
public interface RoleFunctionConsoleDao extends BaseMapper<CoreRoleFunction> {
@Update
void deleteRoleFunction(List<Long> ids);
List<Long> getFunctionIdByRole(Long roleId);
......
......@@ -10,6 +10,7 @@ import org.beetl.sql.core.page.PageResult;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.Root;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.beetl.sql.mapper.annotation.Update;
import java.util.List;
import java.util.Map;
......@@ -18,9 +19,9 @@ import java.util.Map;
public interface UserConsoleDao extends BaseMapper<CoreUser> {
PageResult<CoreUser> queryByCondition(PageRequest<CoreUser> query, @Root Map params);
@Update
void batchDelUserByIds( List<Long> ids);
@Update
void batchUpdateUserState(List<Long> ids, GeneralStateEnum state);
List<CoreUserRole> queryUserRole( Long id,Long orgId,Long roleId);
......
......@@ -7,6 +7,7 @@ import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import com.ibeetl.admin.core.entity.CoreDict;
import org.beetl.sql.mapper.annotation.Update;
/**
* 字典DAO接口
......@@ -37,5 +38,4 @@ public interface CoreDictDao extends BaseMapper<CoreDict> {
*/
List<CoreDict> findChildByParent(Long id);
int bathDelByValue(List<String> values);
}
......@@ -6,6 +6,7 @@ import com.ibeetl.admin.core.entity.CoreMenu;
import org.beetl.sql.core.page.PageRequest;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.beetl.sql.mapper.annotation.Update;
import java.util.List;
......@@ -13,7 +14,7 @@ import java.util.List;
public interface CoreMenuDao extends BaseMapper<CoreMenu> {
void queryByCondtion(PageRequest query);
@Update
void clearMenuFunction(List<Long> functionIds);
List<CoreMenu> allMenuWithURL();
......
......@@ -4,6 +4,7 @@ package com.ibeetl.admin.core.dao;
import com.ibeetl.admin.core.entity.CoreRoleMenu;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.beetl.sql.mapper.annotation.Update;
import java.util.List;
......@@ -22,5 +23,6 @@ public interface CoreRoleMenuDao extends BaseMapper<CoreRoleMenu> {
* 根据菜单id删除角色和菜单关系
* @param ids
*/
@Update
void deleteRoleMenu(List<Long> ids);
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment