Merge branch 'liwei' of root/warewms-api into master

warewms-admin/pom.xml

@@ -23,13 +23,23 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
-
+        <!-- 单元测试 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
         <!-- 核心模块-->
         <dependency>
             <groupId>com.warewms</groupId>
             <artifactId>warewms-system</artifactId>
         </dependency>
 
+
         <!-- 定时任务-->
         <dependency>
             <groupId>com.warewms</groupId>

warewms-admin/src/test/java/TestData.java

@@ -0,0 +1,45 @@
+import com.warewms.WarewmsApplication;
+import com.warewms.common.core.controller.BaseController;
+import com.warewms.common.core.domain.entity.SysDictData;
+import com.warewms.common.core.domain.entity.SysDictType;
+import com.warewms.common.core.domain.entity.SysUser;
+import com.warewms.common.utils.poi.ExcelUtil;
+import com.warewms.system.service.ISysDictDataService;
+import com.warewms.system.service.ISysDictTypeService;
+import com.warewms.system.service.ISysNoticeService;
+import com.warewms.system.service.ISysUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = WarewmsApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Slf4j
+public class TestData extends BaseController<SysDictType> {
+
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+
+    @Test
+    public void export()
+    {
+        List<SysDictType> list = dictTypeService.selectDictTypeList(new SysDictType());
+        log.info("输出结果{}",list);
+    }
+
+}

warewms-system/src/main/java/com/warewms/system/controller/system/SysConfigController.java

@@ -3,6 +3,7 @@ package com.warewms.system.controller.system;
 import com.warewms.common.annotation.Log;
 import com.warewms.common.core.controller.BaseController;
 import com.warewms.common.core.domain.AjaxResult;
+import com.warewms.common.core.domain.base.page.PageDomain;
 import com.warewms.common.core.domain.base.page.TableDataInfo;
 import com.warewms.common.enums.BusinessType;
 import com.warewms.common.utils.poi.ExcelUtil;
@@ -23,7 +24,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/config")
-public class  SysConfigController extends BaseController
+public class  SysConfigController extends BaseController<SysConfig>
 {
     @Autowired
     private ISysConfigService configService;
@@ -31,19 +32,11 @@ public class  SysConfigController extends BaseController
     /**
      * 获取参数配置列表
      */
-    /*@PreAuthorize("@ss.hasPermi('system:config:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(SysConfig config)
-    {
-        startPage();
-        List<SysConfig> list = configService.selectConfigList(config);
-        return getDataTable(list);
-    }*/
 
     @PreAuthorize("@ss.hasPermi('system:config:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysConfig config) {
-        return null;
+    public TableDataInfo<SysConfig> list(PageDomain pageDomain, SysConfig config) {
+        return configService.selectConfigList(pageDomain,config);
     }
 
 

warewms-system/src/main/java/com/warewms/system/controller/system/SysDictDataController.java

@@ -3,6 +3,8 @@ package com.warewms.system.controller.system;
 import com.warewms.common.annotation.Log;
 import com.warewms.common.core.controller.BaseController;
 import com.warewms.common.core.domain.AjaxResult;
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
 import com.warewms.common.core.domain.entity.SysDictData;
 import com.warewms.common.enums.BusinessType;
 import com.warewms.common.utils.StringUtils;
@@ -25,7 +27,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/dict/data")
-public class SysDictDataController extends BaseController
+public class SysDictDataController extends BaseController<SysDictData>
 {
     @Autowired
     private ISysDictDataService dictDataService;
@@ -33,14 +35,12 @@ public class SysDictDataController extends BaseController
     @Autowired
     private ISysDictTypeService dictTypeService;
 
-    /*@PreAuthorize("@ss.hasPermi('system:dict:list')")
+
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysDictData dictData)
-    {
-        startPage();
-        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
-        return getDataTable(list);
-    }*/
+    public TableDataInfo<SysDictData> list(PageDomain pageDomain, SysDictData dictData) {
+        return dictDataService.selectDictDataList(pageDomain, dictData);
+    }
 
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")

warewms-system/src/main/java/com/warewms/system/controller/system/SysDictTypeController.java

@@ -6,6 +6,7 @@ import com.warewms.common.core.domain.AjaxResult;
 import com.warewms.common.core.domain.base.page.PageDomain;
 import com.warewms.common.core.domain.base.page.TableDataInfo;
 import com.warewms.common.core.domain.entity.SysDictType;
+import com.warewms.common.core.domain.entity.SysUser;
 import com.warewms.common.enums.BusinessType;
 import com.warewms.common.utils.bean.BeanUtils;
 import com.warewms.common.utils.poi.ExcelUtil;
@@ -33,12 +34,10 @@ public class SysDictTypeController extends BaseController<SysDictType>
 
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
-    public TableDataInfo page(PageDomain pageDomain, SysDictType sysDictType) {
-        Map<String, Object> pageParams = BeanUtils.beanToMap(pageDomain);
-        Map<String, Object> params = BeanUtils.beanToMap(sysDictType, pageParams);
-        return getDataTable(dictTypeService.page(params));
+    public TableDataInfo<SysDictType> page(PageDomain pageDomain, SysDictType sysDictType) {
+
+        return dictTypeService.selectDictTypeList(pageDomain,sysDictType);
 
-        //dictTypeService.selectDictTypeList();
     }
 
 

warewms-system/src/main/java/com/warewms/system/controller/system/SysNoticeController.java

@@ -3,6 +3,10 @@ package com.warewms.system.controller.system;
 import com.warewms.common.annotation.Log;
 import com.warewms.common.core.controller.BaseController;
 import com.warewms.common.core.domain.AjaxResult;
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
+import com.warewms.common.core.domain.entity.SysMenu;
+import com.warewms.common.core.domain.entity.SysUser;
 import com.warewms.common.enums.BusinessType;
 import com.warewms.system.domain.SysNotice;
 import com.warewms.system.service.ISysNoticeService;
@@ -18,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/system/notice")
-public class SysNoticeController extends BaseController
+public class SysNoticeController extends BaseController<SysNotice>
 {
     @Autowired
     private ISysNoticeService noticeService;
@@ -26,14 +30,11 @@ public class SysNoticeController extends BaseController
     /**
      * 获取通知公告列表
      */
-    /*@PreAuthorize("@ss.hasPermi('system:notice:list')")
+    @PreAuthorize("@ss.hasPermi('system:notice:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysNotice notice)
-    {
-        startPage();
-        List<SysNotice> list = noticeService.selectNoticeList(notice);
-        return getDataTable(list);
-    }*/
+    public TableDataInfo<SysNotice> list(PageDomain pageDomain, SysNotice notice) {
+        return noticeService.selectNoticeList(pageDomain, notice);
+    }
 
     /**
      * 根据通知公告编号获取详细信息

warewms-system/src/main/java/com/warewms/system/controller/system/SysPostController.java

@@ -3,6 +3,8 @@ package com.warewms.system.controller.system;
 import com.warewms.common.annotation.Log;
 import com.warewms.common.core.controller.BaseController;
 import com.warewms.common.core.domain.AjaxResult;
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
 import com.warewms.common.enums.BusinessType;
 import com.warewms.common.utils.poi.ExcelUtil;
 import com.warewms.system.domain.SysPost;
@@ -22,7 +24,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/post")
-public class SysPostController extends BaseController
+public class SysPostController extends BaseController<SysPost>
 {
     @Autowired
     private ISysPostService postService;
@@ -30,15 +32,12 @@ public class SysPostController extends BaseController
     /**
      * 获取岗位列表
      */
-    /*@PreAuthorize("@ss.hasPermi('system:post:list')")
+    @PreAuthorize("@ss.hasPermi('system:post:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysPost post)
-    {
-        startPage();
-        List<SysPost> list = postService.selectPostList(post);
-        return getDataTable(list);
-    }*/
-    
+    public TableDataInfo<SysPost> list(PageDomain pageDomain, SysPost post) {
+        return postService.selectPostList(pageDomain, post);
+    }
+
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:post:export')")
     @PostMapping("/export")

warewms-system/src/main/java/com/warewms/system/controller/system/SysRoleController.java

@@ -3,6 +3,8 @@ package com.warewms.system.controller.system;
 import com.warewms.common.annotation.Log;
 import com.warewms.common.core.controller.BaseController;
 import com.warewms.common.core.domain.AjaxResult;
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
 import com.warewms.common.core.domain.entity.SysDept;
 import com.warewms.common.core.domain.entity.SysRole;
 import com.warewms.common.core.domain.model.LoginUser;
@@ -30,7 +32,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/role")
-public class SysRoleController extends BaseController
+public class SysRoleController extends BaseController<SysRole>
 {
     @Autowired
     private ISysRoleService roleService;
@@ -47,14 +49,12 @@ public class SysRoleController extends BaseController
     @Autowired
     private ISysDeptService deptService;
 
-    /*@PreAuthorize("@ss.hasPermi('system:role:list')")
+
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysRole role)
-    {
-        startPage();
-        List<SysRole> list = roleService.selectRoleList(role);
-        return getDataTable(list);
-    }*/
+    public TableDataInfo<SysRole> list(PageDomain pageDomain, SysRole role) {
+        return roleService.selectRoleList(pageDomain, role);
+    }
 
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:role:export')")

warewms-system/src/main/java/com/warewms/system/mapper/SysConfigMapper.java

@@ -2,15 +2,16 @@ package com.warewms.system.mapper;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.warewms.system.domain.SysConfig;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 参数配置 数据层
  * 
  * @author ruoyi
  */
-public interface SysConfigMapper extends BaseMapper<SysConfig> {
+public interface SysConfigMapper {
     /**
      * 查询参数配置信息
      *
@@ -33,7 +34,9 @@ public interface SysConfigMapper extends BaseMapper<SysConfig> {
      * @param config 参数配置信息
      * @return 参数配置集合
      */
-    public List<SysConfig> selectConfigList(SysConfig config);
+    public List<SysConfig> selectConfigList(@Param("config") SysConfig config);
+
+    public Page<SysConfig> selectConfigList(@Param("page") Page<SysConfig> page, @Param("config") SysConfig config);
 
     /**
      * 根据键名查询参数配置信息

warewms-system/src/main/java/com/warewms/system/mapper/SysDictDataMapper.java

@@ -1,6 +1,9 @@
 package com.warewms.system.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.warewms.system.domain.SysPost;
 import org.apache.ibatis.annotations.Param;
 import com.warewms.common.core.domain.entity.SysDictData;
 
@@ -11,13 +14,22 @@ import com.warewms.common.core.domain.entity.SysDictData;
  */
 public interface SysDictDataMapper
 {
+
+    /**
+     * 查询岗位数据集合
+     *
+     * @param dictData 岗位信息
+     * @return 岗位数据集合
+     */
+    Page<SysDictData> selectDictDataList(@Param("page") Page<SysDictData> page, @Param("dictData") SysDictData dictData);
+
     /**
      * 根据条件分页查询字典数据
      * 
      * @param dictData 字典数据信息
      * @return 字典数据集合信息
      */
-    public List<SysDictData> selectDictDataList(SysDictData dictData);
+    public List<SysDictData> selectDictDataList(@Param("dictData")SysDictData dictData);
 
     /**
      * 根据字典类型查询字典数据

warewms-system/src/main/java/com/warewms/system/mapper/SysDictTypeMapper.java

@@ -3,14 +3,17 @@ package com.warewms.system.mapper;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.warewms.common.core.domain.entity.SysDictType;
+import com.warewms.common.core.domain.entity.SysUser;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 字典表 数据层
  * 
  * @author ruoyi
  */
-public interface SysDictTypeMapper extends BaseMapper<SysDictType>
+public interface SysDictTypeMapper
 {
     /**
      * 根据条件分页查询字典类型
@@ -18,7 +21,15 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType>
      * @param dictType 字典类型信息
      * @return 字典类型集合信息
      */
-    public List<SysDictType> selectDictTypeList(SysDictType dictType);
+    public List<SysDictType> selectDictTypeList(@Param("dictType") SysDictType dictType);
+
+    /**
+     * 根据条件分页查询字典类型
+     *
+     * @param dictType 字典类型信息
+     * @return 字典类型集合信息
+     */
+    public Page<SysDictType> selectDictTypeList(@Param("page") Page<SysDictType> page, @Param("dictType") SysDictType dictType);
 
     /**
      * 根据所有字典类型

warewms-system/src/main/java/com/warewms/system/mapper/SysMenuMapper.java

@@ -1,6 +1,8 @@
 package com.warewms.system.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import com.warewms.common.core.domain.entity.SysMenu;
 
@@ -9,8 +11,7 @@ import com.warewms.common.core.domain.entity.SysMenu;
  *
  * @author ruoyi
  */
-public interface SysMenuMapper
-{
+public interface SysMenuMapper extends BaseMapper<SysMenu> {
     /**
      * 查询系统菜单列表
      *

warewms-system/src/main/java/com/warewms/system/mapper/SysNoticeMapper.java

@@ -1,7 +1,11 @@
 package com.warewms.system.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.warewms.common.core.domain.entity.SysDictType;
 import com.warewms.system.domain.SysNotice;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 通知公告表 数据层
@@ -24,7 +28,16 @@ public interface SysNoticeMapper
      * @param notice 公告信息
      * @return 公告集合
      */
-    public List<SysNotice> selectNoticeList(SysNotice notice);
+    public List<SysNotice> selectNoticeList(@Param("notice") SysNotice notice);
+
+    /**
+     * 查询公告列表
+     *
+     * @param notice 公告信息
+     * @return 公告集合
+     */
+    public Page<SysNotice> selectNoticeList(@Param("page") Page<SysNotice> page, @Param("notice") SysNotice notice);
+
 
     /**
      * 新增公告

warewms-system/src/main/java/com/warewms/system/mapper/SysPostMapper.java

@@ -1,7 +1,12 @@
 package com.warewms.system.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.warewms.common.core.domain.entity.SysRole;
+import com.warewms.common.core.domain.entity.SysUser;
 import com.warewms.system.domain.SysPost;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 岗位信息 数据层
@@ -10,13 +15,22 @@ import com.warewms.system.domain.SysPost;
  */
 public interface SysPostMapper
 {
+
+    /**
+     * 查询岗位数据集合
+     *
+     * @param post 岗位信息
+     * @return 岗位数据集合
+     */
+    Page<SysPost> selectPostList(@Param("page") Page<SysPost> page, @Param("post") SysPost post);
+
     /**
      * 查询岗位数据集合
      * 
      * @param post 岗位信息
      * @return 岗位数据集合
      */
-    public List<SysPost> selectPostList(SysPost post);
+    public List<SysPost> selectPostList(@Param("post") SysPost post);
 
     /**
      * 查询所有岗位

warewms-system/src/main/java/com/warewms/system/mapper/SysRoleMapper.java

@@ -1,7 +1,11 @@
 package com.warewms.system.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.warewms.common.core.domain.entity.SysRole;
+import com.warewms.common.core.domain.entity.SysUser;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 角色表 数据层
@@ -10,13 +14,22 @@ import com.warewms.common.core.domain.entity.SysRole;
  */
 public interface SysRoleMapper
 {
+
+    /**
+     * 根据条件分页查询角色数据
+     *
+     * @param sysRole 角色信息
+     * @return 角色数据集合信息
+     */
+    Page<SysRole> selectRoleList(@Param("page") Page<SysRole> page, @Param("sysRole") SysRole sysRole);
+
     /**
      * 根据条件分页查询角色数据
      * 
-     * @param role 角色信息
+     * @param sysRole 角色信息
      * @return 角色数据集合信息
      */
-    public List<SysRole> selectRoleList(SysRole role);
+    public List<SysRole> selectRoleList(@Param("sysRole") SysRole sysRole);
 
     /**
      * 根据用户ID查询角色

warewms-system/src/main/java/com/warewms/system/service/ISysConfigService.java

@@ -2,7 +2,8 @@ package com.warewms.system.service;
 
 import java.util.List;
 
-import com.warewms.common.service.CrudService;
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
 import com.warewms.system.domain.SysConfig;
 
 /**
@@ -10,7 +11,7 @@ import com.warewms.system.domain.SysConfig;
  * 
  * @author ruoyi
  */
-public interface ISysConfigService extends CrudService<SysConfig, SysConfig>
+public interface ISysConfigService
 {
     /**
      * 查询参数配置信息
@@ -43,6 +44,15 @@ public interface ISysConfigService extends CrudService<SysConfig, SysConfig>
      */
     public List<SysConfig> selectConfigList(SysConfig config);
 
+    /**
+     * 新增参数配置
+     *
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    public TableDataInfo<SysConfig> selectConfigList(PageDomain pageDomain, SysConfig config);
+
+
     /**
      * 新增参数配置
      * 

warewms-system/src/main/java/com/warewms/system/service/ISysDictDataService.java

@@ -1,7 +1,11 @@
 package com.warewms.system.service;
 
 import java.util.List;
+
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
 import com.warewms.common.core.domain.entity.SysDictData;
+import com.warewms.system.domain.SysNotice;
 
 /**
  * 字典 业务层
@@ -10,6 +14,15 @@ import com.warewms.common.core.domain.entity.SysDictData;
  */
 public interface ISysDictDataService
 {
+
+    /**
+     * 根据条件分页查询字典数据
+     *
+     * @param dictData 字典数据信息
+     * @return 字典数据集合信息
+     */
+    public TableDataInfo<SysDictData> selectDictDataList(PageDomain pageDomain, SysDictData dictData);
+
     /**
      * 根据条件分页查询字典数据
      * 

warewms-system/src/main/java/com/warewms/system/service/ISysDictTypeService.java

@@ -1,8 +1,12 @@
 package com.warewms.system.service;
 
 import java.util.List;
+
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
 import com.warewms.common.core.domain.entity.SysDictData;
 import com.warewms.common.core.domain.entity.SysDictType;
+import com.warewms.common.core.domain.entity.SysUser;
 import com.warewms.common.service.CrudService;
 
 /**
@@ -10,7 +14,7 @@ import com.warewms.common.service.CrudService;
  * 
  * @author ruoyi
  */
-public interface ISysDictTypeService extends CrudService<SysDictType, SysDictType>
+public interface ISysDictTypeService
 {
     /**
      * 根据条件分页查询字典类型
@@ -20,6 +24,7 @@ public interface ISysDictTypeService extends CrudService<SysDictType, SysDictTyp
      */
     public List<SysDictType> selectDictTypeList(SysDictType dictType);
 
+    public TableDataInfo<SysDictType> selectDictTypeList(PageDomain pageDomain, SysDictType dictType);
     /**
      * 根据所有字典类型
      * 

warewms-system/src/main/java/com/warewms/system/service/ISysNoticeService.java

@@ -1,7 +1,11 @@
 package com.warewms.system.service;
 
 import java.util.List;
+
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
 import com.warewms.system.domain.SysNotice;
+import com.warewms.system.domain.SysPost;
 
 /**
  * 公告 服务层
@@ -18,6 +22,14 @@ public interface ISysNoticeService
      */
     public SysNotice selectNoticeById(Long noticeId);
 
+    /**
+     * 查询公告列表
+     *
+     * @param notice 公告信息
+     * @return 公告集合
+     */
+    public TableDataInfo<SysNotice> selectNoticeList(PageDomain pageDomain, SysNotice notice);
+
     /**
      * 查询公告列表
      * 

warewms-system/src/main/java/com/warewms/system/service/ISysPostService.java

@@ -1,6 +1,10 @@
 package com.warewms.system.service;
 
 import java.util.List;
+
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
+import com.warewms.common.core.domain.entity.SysRole;
 import com.warewms.system.domain.SysPost;
 
 /**
@@ -10,6 +14,15 @@ import com.warewms.system.domain.SysPost;
  */
 public interface ISysPostService
 {
+
+    /**
+     * 查询岗位信息集合
+     *
+     * @param post 岗位信息
+     * @return 岗位列表
+     */
+    public TableDataInfo<SysPost> selectPostList(PageDomain pageDomain, SysPost post);
+
     /**
      * 查询岗位信息集合
      * 

warewms-system/src/main/java/com/warewms/system/service/ISysRoleService.java

@@ -2,7 +2,11 @@ package com.warewms.system.service;
 
 import java.util.List;
 import java.util.Set;
+
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
 import com.warewms.common.core.domain.entity.SysRole;
+import com.warewms.common.core.domain.entity.SysUser;
 import com.warewms.system.domain.SysUserRole;
 
 /**
@@ -12,6 +16,14 @@ import com.warewms.system.domain.SysUserRole;
  */
 public interface ISysRoleService
 {
+
+    /**
+     * 根据条件分页查询角色数据
+     * @param role 角色信息
+     * @return 角色数据集合信息
+     */
+    public TableDataInfo<SysRole> selectRoleList(PageDomain pageDomain, SysRole role);
+
     /**
      * 根据条件分页查询角色数据
      * 

warewms-system/src/main/java/com/warewms/system/service/impl/SysConfigServiceImpl.java

@@ -2,11 +2,12 @@ package com.warewms.system.service.impl;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import javax.annotation.PostConstruct;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.warewms.common.service.impl.CrudServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
+import com.warewms.common.service.impl.SystemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.warewms.common.annotation.DataSource;
@@ -27,7 +28,12 @@ import com.warewms.system.service.ISysConfigService;
  * @author ruoyi
  */
 @Service
-public class SysConfigServiceImpl extends CrudServiceImpl<SysConfigMapper, SysConfig, SysConfig> implements ISysConfigService {
+public class SysConfigServiceImpl extends SystemService<SysConfig> implements ISysConfigService {
+
+
+    @Autowired
+    private SysConfigMapper sysConfigMapper;
+
     @Autowired
     private RedisCache redisCache;
 
@@ -51,7 +57,7 @@ public class SysConfigServiceImpl extends CrudServiceImpl<SysConfigMapper, SysCo
     public SysConfig selectConfigById(Long configId) {
         SysConfig config = new SysConfig();
         config.setConfigId(configId);
-        return baseDao.selectConfig(config);
+        return sysConfigMapper.selectConfig(config);
     }
 
     /**
@@ -69,7 +75,7 @@ public class SysConfigServiceImpl extends CrudServiceImpl<SysConfigMapper, SysCo
         }
         SysConfig config = new SysConfig();
         config.setConfigKey(configKey);
-        SysConfig retConfig = baseDao.selectConfig(config);
+        SysConfig retConfig = sysConfigMapper.selectConfig(config);
         if (StringUtils.isNotNull(retConfig))
         {
             redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
@@ -101,7 +107,14 @@ public class SysConfigServiceImpl extends CrudServiceImpl<SysConfigMapper, SysCo
      */
     @Override
     public List<SysConfig> selectConfigList(SysConfig config) {
-        return baseDao.selectConfigList(config);
+        return sysConfigMapper.selectConfigList(config);
+    }
+
+    @Override
+    public TableDataInfo<SysConfig> selectConfigList(PageDomain pageDomain, SysConfig config)
+    {
+        Page<SysConfig> page = convertToPage(pageDomain);
+        return getDataTable(sysConfigMapper.selectConfigList(page,config));
     }
 
     /**
@@ -112,7 +125,7 @@ public class SysConfigServiceImpl extends CrudServiceImpl<SysConfigMapper, SysCo
      */
     @Override
     public int insertConfig(SysConfig config) {
-        int row = baseDao.insertConfig(config);
+        int row = sysConfigMapper.insertConfig(config);
         if (row > 0)
         {
             redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
@@ -128,13 +141,13 @@ public class SysConfigServiceImpl extends CrudServiceImpl<SysConfigMapper, SysCo
      */
     @Override
     public int updateConfig(SysConfig config) {
-        SysConfig temp = baseDao.selectConfigById(config.getConfigId());
+        SysConfig temp = sysConfigMapper.selectConfigById(config.getConfigId());
         if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey()))
         {
             redisCache.deleteObject(getCacheKey(temp.getConfigKey()));
         }
 
-        int row = baseDao.updateConfig(config);
+        int row = sysConfigMapper.updateConfig(config);
         if (row > 0)
         {
             redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
@@ -156,7 +169,7 @@ public class SysConfigServiceImpl extends CrudServiceImpl<SysConfigMapper, SysCo
             {
                 throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
             }
-            baseDao.deleteConfigById(configId);
+            sysConfigMapper.deleteConfigById(configId);
             redisCache.deleteObject(getCacheKey(config.getConfigKey()));
         }
     }
@@ -166,7 +179,7 @@ public class SysConfigServiceImpl extends CrudServiceImpl<SysConfigMapper, SysCo
      */
     @Override
     public void loadingConfigCache() {
-        List<SysConfig> configsList = baseDao.selectConfigList(new SysConfig());
+        List<SysConfig> configsList = sysConfigMapper.selectConfigList(new SysConfig());
         for (SysConfig config : configsList)
         {
             redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
@@ -200,7 +213,7 @@ public class SysConfigServiceImpl extends CrudServiceImpl<SysConfigMapper, SysCo
     @Override
     public boolean checkConfigKeyUnique(SysConfig config) {
         Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId();
-        SysConfig info = baseDao.checkConfigKeyUnique(config.getConfigKey());
+        SysConfig info = sysConfigMapper.checkConfigKeyUnique(config.getConfigKey());
         if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue())
         {
             return UserConstants.NOT_UNIQUE;
@@ -219,8 +232,5 @@ public class SysConfigServiceImpl extends CrudServiceImpl<SysConfigMapper, SysCo
         return CacheConstants.SYS_CONFIG_KEY + configKey;
     }
 
-    @Override
-    public QueryWrapper<SysConfig> getWrapper(Map<String, Object> params) {
-        return null;
-    }
+
 }

warewms-system/src/main/java/com/warewms/system/service/impl/SysDictDataServiceImpl.java

@@ -2,6 +2,11 @@ package com.warewms.system.service.impl;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
+import com.warewms.common.service.impl.SystemService;
+import com.warewms.system.domain.SysNotice;
 import com.warewms.system.service.ISysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -15,11 +20,18 @@ import com.warewms.system.mapper.SysDictDataMapper;
  * @author ruoyi
  */
 @Service
-public class SysDictDataServiceImpl implements ISysDictDataService
+public class SysDictDataServiceImpl extends SystemService<SysDictData> implements ISysDictDataService
 {
     @Autowired
     private SysDictDataMapper dictDataMapper;
 
+
+    @Override
+    public TableDataInfo<SysDictData> selectDictDataList(PageDomain pageDomain, SysDictData dictData)
+    {
+        Page<SysDictData> page = convertToPage(pageDomain);
+        return getDataTable(dictDataMapper.selectDictDataList(page, dictData));
+    }
     /**
      * 根据条件分页查询字典数据
      * 

warewms-system/src/main/java/com/warewms/system/service/impl/SysDictTypeServiceImpl.java

@@ -6,8 +6,12 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import javax.annotation.PostConstruct;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.warewms.common.service.impl.CrudServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.warewms.common.annotation.DataScope;
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
+import com.warewms.common.core.domain.entity.SysUser;
+import com.warewms.common.service.impl.SystemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,9 +31,12 @@ import com.warewms.system.service.ISysDictTypeService;
  * @author ruoyi
  */
 @Service
-public class SysDictTypeServiceImpl extends CrudServiceImpl<SysDictTypeMapper, SysDictType, SysDictType> implements ISysDictTypeService
+public class SysDictTypeServiceImpl extends SystemService<SysDictType> implements ISysDictTypeService
 {
 
+    @Autowired
+    private SysDictTypeMapper selectDictTypeList;
+
     @Autowired
     private SysDictDataMapper dictDataMapper;
 
@@ -51,10 +58,16 @@ public class SysDictTypeServiceImpl extends CrudServiceImpl<SysDictTypeMapper, S
     @Override
     public List<SysDictType> selectDictTypeList(SysDictType dictType)
     {
-        return baseDao.selectDictTypeList(dictType);
+        return selectDictTypeList.selectDictTypeList(dictType);
     }
 
 
+    @Override
+    public TableDataInfo<SysDictType> selectDictTypeList(PageDomain pageDomain, SysDictType dictType)
+    {
+        Page<SysDictType> page = convertToPage(pageDomain);
+        return getDataTable(selectDictTypeList.selectDictTypeList(page, dictType));
+    }
 
 
 
@@ -67,7 +80,7 @@ public class SysDictTypeServiceImpl extends CrudServiceImpl<SysDictTypeMapper, S
     @Override
     public List<SysDictType> selectDictTypeAll()
     {
-        return baseDao.selectDictTypeAll();
+        return selectDictTypeList.selectDictTypeAll();
     }
 
     /**
@@ -102,7 +115,7 @@ public class SysDictTypeServiceImpl extends CrudServiceImpl<SysDictTypeMapper, S
     @Override
     public SysDictType selectDictTypeById(Long dictId)
     {
-        return baseDao.selectDictTypeById(dictId);
+        return selectDictTypeList.selectDictTypeById(dictId);
     }
 
     /**
@@ -114,7 +127,7 @@ public class SysDictTypeServiceImpl extends CrudServiceImpl<SysDictTypeMapper, S
     @Override
     public SysDictType selectDictTypeByType(String dictType)
     {
-        return baseDao.selectDictTypeByType(dictType);
+        return selectDictTypeList.selectDictTypeByType(dictType);
     }
 
     /**
@@ -132,7 +145,7 @@ public class SysDictTypeServiceImpl extends CrudServiceImpl<SysDictTypeMapper, S
             {
                 throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
             }
-            baseDao.deleteDictTypeById(dictId);
+            selectDictTypeList.deleteDictTypeById(dictId);
             DictUtils.removeDictCache(dictType.getDictType());
         }
     }
@@ -180,7 +193,7 @@ public class SysDictTypeServiceImpl extends CrudServiceImpl<SysDictTypeMapper, S
     @Override
     public int insertDictType(SysDictType dict)
     {
-        int row = baseDao.insertDictType(dict);
+        int row = selectDictTypeList.insertDictType(dict);
         if (row > 0)
         {
             DictUtils.setDictCache(dict.getDictType(), null);
@@ -198,9 +211,9 @@ public class SysDictTypeServiceImpl extends CrudServiceImpl<SysDictTypeMapper, S
     @Transactional
     public int updateDictType(SysDictType dict)
     {
-        SysDictType oldDict = baseDao.selectDictTypeById(dict.getDictId());
+        SysDictType oldDict = selectDictTypeList.selectDictTypeById(dict.getDictId());
         dictDataMapper.updateDictDataType(oldDict.getDictType(), dict.getDictType());
-        int row = baseDao.updateDictType(dict);
+        int row = selectDictTypeList.updateDictType(dict);
         if (row > 0)
         {
             List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType());
@@ -219,16 +232,11 @@ public class SysDictTypeServiceImpl extends CrudServiceImpl<SysDictTypeMapper, S
     public boolean checkDictTypeUnique(SysDictType dict)
     {
         Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId();
-        SysDictType dictType = baseDao.checkDictTypeUnique(dict.getDictType());
+        SysDictType dictType = selectDictTypeList.checkDictTypeUnique(dict.getDictType());
         if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
     }
-
-    @Override
-    public QueryWrapper<SysDictType> getWrapper(Map<String, Object> params) {
-        return null;
-    }
 }

warewms-system/src/main/java/com/warewms/system/service/impl/SysNoticeServiceImpl.java

@@ -1,6 +1,12 @@
 package com.warewms.system.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
+import com.warewms.common.service.impl.SystemService;
+import com.warewms.system.domain.SysPost;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.warewms.system.domain.SysNotice;
@@ -13,7 +19,7 @@ import com.warewms.system.service.ISysNoticeService;
  * @author ruoyi
  */
 @Service
-public class SysNoticeServiceImpl implements ISysNoticeService
+public class SysNoticeServiceImpl extends SystemService<SysNotice> implements ISysNoticeService
 {
     @Autowired
     private SysNoticeMapper noticeMapper;
@@ -30,6 +36,13 @@ public class SysNoticeServiceImpl implements ISysNoticeService
         return noticeMapper.selectNoticeById(noticeId);
     }
 
+
+    @Override
+    public TableDataInfo<SysNotice> selectNoticeList(PageDomain pageDomain, SysNotice notice)
+    {
+        Page<SysNotice> page = convertToPage(pageDomain);
+        return getDataTable(noticeMapper.selectNoticeList(page, notice));
+    }
     /**
      * 查询公告列表
      * 

warewms-system/src/main/java/com/warewms/system/service/impl/SysPostServiceImpl.java

@@ -1,6 +1,13 @@
 package com.warewms.system.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.warewms.common.annotation.DataScope;
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
+import com.warewms.common.core.domain.entity.SysRole;
+import com.warewms.common.service.impl.SystemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.warewms.common.constant.UserConstants;
@@ -17,7 +24,7 @@ import com.warewms.system.service.ISysPostService;
  * @author ruoyi
  */
 @Service
-public class SysPostServiceImpl implements ISysPostService
+public class SysPostServiceImpl extends SystemService<SysPost> implements ISysPostService
 {
     @Autowired
     private SysPostMapper postMapper;
@@ -25,6 +32,13 @@ public class SysPostServiceImpl implements ISysPostService
     @Autowired
     private SysUserPostMapper userPostMapper;
 
+
+    @Override
+    public TableDataInfo<SysPost> selectPostList(PageDomain pageDomain, SysPost post)
+    {
+        Page<SysPost> page = convertToPage(pageDomain);
+        return getDataTable(postMapper.selectPostList(page, post));
+    }
     /**
      * 查询岗位信息集合
      * 

warewms-system/src/main/java/com/warewms/system/service/impl/SysRoleServiceImpl.java

@@ -5,6 +5,12 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
+import com.warewms.common.service.impl.SystemService;
+import com.warewms.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,7 +37,7 @@ import com.warewms.system.service.ISysRoleService;
  * @author ruoyi
  */
 @Service
-public class SysRoleServiceImpl implements ISysRoleService
+public class SysRoleServiceImpl extends SystemService<SysRole>  implements ISysRoleService
 {
     @Autowired
     private SysRoleMapper roleMapper;
@@ -45,6 +51,16 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Autowired
     private SysRoleDeptMapper roleDeptMapper;
 
+
+
+    @Override
+    @DataScope(deptAlias = "d")
+    public TableDataInfo<SysRole> selectRoleList(PageDomain pageDomain, SysRole role)
+    {
+        Page<SysRole> page = convertToPage(pageDomain);
+        return getDataTable(roleMapper.selectRoleList(page, role));
+    }
+
     /**
      * 根据条件分页查询角色数据
      * 

warewms-system/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -41,20 +41,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
         <where>
-			<if test="configName != null and configName != ''">
-				AND config_name like concat('%', #{configName}, '%')
+			<if test="config.configName != null and config.configName != ''">
+				AND config_name like concat('%', #{config.configName}, '%')
 			</if>
-			<if test="configType != null and configType != ''">
-				AND config_type = #{configType}
+			<if test="config.configType != null and config.configType != ''">
+				AND config_type = #{config.configType}
 			</if>
-			<if test="configKey != null and configKey != ''">
-				AND config_key like concat('%', #{configKey}, '%')
+			<if test="config.configKey != null and config.configKey != ''">
+				AND config_key like concat('%', #{config.configKey}, '%')
 			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+			<if test="config.params.beginTime != null and config.params.beginTime != ''"><!-- 开始时间检索 -->
+				and date_format(create_time,'%y%m%d') &gt;= date_format(#{config.params.beginTime},'%y%m%d')
 			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			<if test="config.params.endTime != null and config.params.endTime != ''"><!-- 结束时间检索 -->
+				and date_format(create_time,'%y%m%d') &lt;= date_format(#{config.params.endTime},'%y%m%d')
 			</if>
 		</where>
     </select>

warewms-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -28,14 +28,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult">
 	    <include refid="selectDictDataVo"/>
 		<where>
-		    <if test="dictType != null and dictType != ''">
-				AND dict_type = #{dictType}
+		    <if test="dictData.dictType != null and dictData.dictType != ''">
+				AND dict_type = #{dictData.dictType}
 			</if>
-			<if test="dictLabel != null and dictLabel != ''">
-				AND dict_label like concat('%', #{dictLabel}, '%')
+			<if test="dictData.dictLabel != null and dictData.dictLabel != ''">
+				AND dict_label like concat('%', #{dictData.dictLabel}, '%')
 			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
+			<if test="dictData.status != null and dictData.status != ''">
+				AND status = #{dictData.status}
 			</if>
 		</where>
 		order by dict_sort asc

warewms-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -1,105 +1,107 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.warewms.system.mapper.SysDictTypeMapper">
 
-	<resultMap type="SysDictType" id="SysDictTypeResult">
-		<id     property="dictId"     column="dict_id"     />
-		<result property="dictName"   column="dict_name"   />
-		<result property="dictType"   column="dict_type"   />
-		<result property="status"     column="status"      />
-		<result property="createBy"   column="create_by"   />
-		<result property="createTime" column="create_time" />
-		<result property="updateBy"   column="update_by"   />
-		<result property="updateTime" column="update_time" />
-	</resultMap>
-	
-	<sql id="selectDictTypeVo">
-        select dict_id, dict_name, dict_type, status, create_by, create_time, remark 
-		from sys_dict_type
+    <resultMap type="SysDictType" id="SysDictTypeResult">
+        <id property="dictId" column="dict_id"/>
+        <result property="dictName" column="dict_name"/>
+        <result property="dictType" column="dict_type"/>
+        <result property="status" column="status"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectDictTypeVo">
+        select dict_id, dict_name, dict_type, status, create_by, create_time, remark
+        from sys_dict_type
     </sql>
 
-	<select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
-	    <include refid="selectDictTypeVo"/>
-		<where>
-		    <if test="dictName != null and dictName != ''">
-				AND dict_name like concat('%', #{dictName}, '%')
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-			<if test="dictType != null and dictType != ''">
-				AND dict_type like concat('%', #{dictType}, '%')
-			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-			</if>
-	    </where>
-	</select>
-	
-	<select id="selectDictTypeAll" resultMap="SysDictTypeResult">
-		<include refid="selectDictTypeVo"/>
-	</select>
-	
-	<select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
-		<include refid="selectDictTypeVo"/>
-		where dict_id = #{dictId}
-	</select>
-	
-	<select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
-		<include refid="selectDictTypeVo"/>
-		where dict_type = #{dictType}
-	</select>
-	
-	<select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">
-		<include refid="selectDictTypeVo"/>
-		where dict_type = #{dictType} limit 1
-	</select>
-	
-	<delete id="deleteDictTypeById" parameterType="Long">
- 		delete from sys_dict_type where dict_id = #{dictId}
- 	</delete>
- 	
- 	<delete id="deleteDictTypeByIds" parameterType="Long">
- 		delete from sys_dict_type where dict_id in
- 		<foreach collection="array" item="dictId" open="(" separator="," close=")">
- 			#{dictId}
-        </foreach> 
- 	</delete>
+    <select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
+        <include refid="selectDictTypeVo"/>
+        <where>
+            <if test="dictType.dictName != null and dictType.dictName != ''">
+                AND dict_name like concat('%', #{dictType.dictName}, '%')
+            </if>
+            <if test="dictType.status != null and dictType.status != ''">
+                AND status = #{dictType.status}
+            </if>
+            <if test="dictType.dictType != null and dictType.dictType != ''">
+                AND dict_type like concat('%', #{dictType.dictType}, '%')
+            </if>
+            <if test="dictType.params.beginTime != null and dictType.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(create_time,'%y%m%d') &gt;= date_format(#{dictType.params.beginTime},'%y%m%d')
+            </if>
+            <if test="dictType.params.endTime != null and dictType.params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(create_time,'%y%m%d') &lt;= date_format(#{dictType.params.endTime},'%y%m%d')
+            </if>
+        </where>
+    </select>
+
+    <select id="selectDictTypeAll" resultMap="SysDictTypeResult">
+        <include refid="selectDictTypeVo"/>
+    </select>
+
+    <select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
+        <include refid="selectDictTypeVo"/>
+        where dict_id = #{dictId}
+    </select>
+
+    <select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
+        <include refid="selectDictTypeVo"/>
+        where dict_type = #{dictType}
+    </select>
+
+    <select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">
+        <include refid="selectDictTypeVo"/>
+        where dict_type = #{dictType} limit 1
+    </select>
+
+    <delete id="deleteDictTypeById" parameterType="Long">
+        delete
+        from sys_dict_type
+        where dict_id = #{dictId}
+    </delete>
+
+    <delete id="deleteDictTypeByIds" parameterType="Long">
+        delete from sys_dict_type where dict_id in
+        <foreach collection="array" item="dictId" open="(" separator="," close=")">
+            #{dictId}
+        </foreach>
+    </delete>
+
+    <update id="updateDictType" parameterType="SysDictType">
+        update sys_dict_type
+        <set>
+            <if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
+            <if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            update_time = sysdate()
+        </set>
+        where dict_id = #{dictId}
+    </update>
+
+    <insert id="insertDictType" parameterType="SysDictType">
+        insert into sys_dict_type(
+        <if test="dictName != null and dictName != ''">dict_name,</if>
+        <if test="dictType != null and dictType != ''">dict_type,</if>
+        <if test="status != null">status,</if>
+        <if test="remark != null and remark != ''">remark,</if>
+        <if test="createBy != null and createBy != ''">create_by,</if>
+        create_time
+        )values(
+        <if test="dictName != null and dictName != ''">#{dictName},</if>
+        <if test="dictType != null and dictType != ''">#{dictType},</if>
+        <if test="status != null">#{status},</if>
+        <if test="remark != null and remark != ''">#{remark},</if>
+        <if test="createBy != null and createBy != ''">#{createBy},</if>
+        sysdate()
+        )
+    </insert>
 
- 	<update id="updateDictType" parameterType="SysDictType">
- 		update sys_dict_type
- 		<set>
- 			<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
- 			<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
- 			<if test="status != null">status = #{status},</if>
- 			<if test="remark != null">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
- 		</set>
- 		where dict_id = #{dictId}
-	</update>
- 	
- 	<insert id="insertDictType" parameterType="SysDictType">
- 		insert into sys_dict_type(
- 			<if test="dictName != null and dictName != ''">dict_name,</if>
- 			<if test="dictType != null and dictType != ''">dict_type,</if>
- 			<if test="status != null">status,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			create_time
- 		)values(
- 			<if test="dictName != null and dictName != ''">#{dictName},</if>
- 			<if test="dictType != null and dictType != ''">#{dictType},</if>
- 			<if test="status != null">#{status},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
- 		)
-	</insert>
-	
 </mapper> 

warewms-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -30,14 +30,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectNoticeList" parameterType="SysNotice" resultMap="SysNoticeResult">
         <include refid="selectNoticeVo"/>
         <where>
-			<if test="noticeTitle != null and noticeTitle != ''">
-				AND notice_title like concat('%', #{noticeTitle}, '%')
+			<if test="notice.noticeTitle != null and notice.noticeTitle != ''">
+				AND notice_title like concat('%', #{notice.noticeTitle}, '%')
 			</if>
-			<if test="noticeType != null and noticeType != ''">
-				AND notice_type = #{noticeType}
+			<if test="notice.noticeType != null and notice.noticeType != ''">
+				AND notice_type = #{notice.noticeType}
 			</if>
-			<if test="createBy != null and createBy != ''">
-				AND create_by like concat('%', #{createBy}, '%')
+			<if test="notice.createBy != null and notice.createBy != ''">
+				AND create_by like concat('%', #{notice.createBy}, '%')
 			</if>
 		</where>
     </select>

warewms-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -25,14 +25,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
 	    <include refid="selectPostVo"/>
 		<where>
-			<if test="postCode != null and postCode != ''">
-				AND post_code like concat('%', #{postCode}, '%')
+			<if test="post.postCode != null and post.postCode != ''">
+				AND post_code like concat('%', #{post.postCode}, '%')
 			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
+			<if test="post.status != null and post.status != ''">
+				AND status = #{post.status}
 			</if>
-			<if test="postName != null and postName != ''">
-				AND post_name like concat('%', #{postName}, '%')
+			<if test="post.postName != null and post.postName != ''">
+				AND post_name like concat('%', #{post.postName}, '%')
 			</if>
 		</where>
 	</select>

warewms-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -33,26 +33,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 		where r.del_flag = '0'
-		<if test="roleId != null and roleId != 0">
-			AND r.role_id = #{roleId}
+		<if test="sysRole.roleId != null and sysRole.roleId != 0">
+			AND r.role_id = #{sysRole.roleId}
 		</if>
-		<if test="roleName != null and roleName != ''">
-			AND r.role_name like concat('%', #{roleName}, '%')
+		<if test="sysRole.roleName != null and sysRole.roleName != ''">
+			AND r.role_name like concat('%', #{sysRole.roleName}, '%')
 		</if>
-		<if test="status != null and status != ''">
-			AND r.status = #{status}
+		<if test="sysRole.status != null and sysRole.status != ''">
+			AND r.status = #{sysRole.status}
 		</if>
-		<if test="roleKey != null and roleKey != ''">
-			AND r.role_key like concat('%', #{roleKey}, '%')
+		<if test="sysRole.roleKey != null and sysRole.roleKey != ''">
+			AND r.role_key like concat('%', #{sysRole.roleKey}, '%')
 		</if>
-		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-			and date_format(r.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+		<if test="sysRole.params.beginTime != null and sysRole.role.params.beginTime != ''"><!-- 开始时间检索 -->
+			and date_format(r.create_time,'%y%m%d') &gt;= date_format(#{sysRole.params.beginTime},'%y%m%d')
 		</if>
-		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-			and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+		<if test="sysRole.params.endTime != null and sysRole.params.endTime != ''"><!-- 结束时间检索 -->
+			and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{sysRole.params.endTime},'%y%m%d')
 		</if>
 		<!-- 数据范围过滤 -->
-		${params.dataScope}
+		${sysRole.params.dataScope}
 		order by r.role_sort
 	</select>