diff --git a/src/main/java/com/fc/v2/common/base/BaseController.java b/src/main/java/com/fc/v2/common/base/BaseController.java
index d6b492e4cf1890320645728a1969a41e90e66b5e..b94375963ef511878d3f58cd67df29aac1ee57cf 100644
--- a/src/main/java/com/fc/v2/common/base/BaseController.java
+++ b/src/main/java/com/fc/v2/common/base/BaseController.java
@@ -5,174 +5,216 @@ import com.fc.v2.common.conf.V2Config;
 import com.fc.v2.common.domain.AjaxResult;
 import com.fc.v2.common.domain.ResuTree;
 import com.fc.v2.common.domain.ResultTable;
+import com.fc.v2.model.custom.Tablepar;
 import com.fc.v2.service.*;
+import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
  * web层通用数据处理
-* @ClassName: BaseController
-* @author fuce
-* @date 2018年8月18日
-*
+ *
+ * @author fuce
+ * @ClassName: BaseController
+ * @date 2018年8月18日
  */
 @Controller
-public class BaseController
-{
-	//系统用户
-	@Autowired
-	public ITSysUserService sysUserService;
-	
-	//系统角色
-	@Autowired
-	public ITSysRoleService sysRoleService;
-	
-	//权限
-	@Autowired
-	public ITSysPermissionService sysPermissionService;
-
-	//日志操作
-	@Autowired
-	public ITSysOperLogService sysOperLogService;
-	//公告
-	@Autowired
-	public ITSysNoticeService sysNoticeService;
+public class BaseController {
+
+    /**
+     * 系统用户
+     */
+    @Autowired
+    public ITSysUserService sysUserService;
+
+    /**
+     * 系统角色
+     */
+    @Autowired
+    public ITSysRoleService sysRoleService;
+
+    /**
+     * 权限
+     */
+    @Autowired
+    public ITSysPermissionService sysPermissionService;
+
+    /**
+     * 日志操作
+     */
+    @Autowired
+    public ITSysOperLogService sysOperLogService;
+
+    /**
+     * 公告
+     */
+    @Autowired
+    public ITSysNoticeService sysNoticeService;
 
     /**
      * 文件上传
      */
-	@Autowired
-	public ITSysFileService sysFileService;
-	//配置文件
-	@Autowired
-	public V2Config v2Config;
+    @Autowired
+    public ITSysFileService sysFileService;
+
+    /**
+     * 配置文件
+     */
+    @Autowired
+    public V2Config v2Config;
 
     /**
      * 将前台传递过来的日期格式的字符串，自动转化为Date类型
+     *
+     * @param binder
      */
     @InitBinder
-    public void initBinder(WebDataBinder binder)
-    {
+    public void initBinder(WebDataBinder binder) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         dateFormat.setLenient(false);
         binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true));
     }
 
-
     /**
      * 响应返回结果
-     * 
+     *
      * @param rows 影响行数
      * @return 操作结果
      */
-    protected AjaxResult toAjax(int rows)
-    {
+    protected AjaxResult toAjax(int rows) {
         return rows > 0 ? success() : error();
     }
 
     /**
      * 返回成功
+     *
+     * @return
      */
-    public AjaxResult success()
-    {
+    public AjaxResult success() {
         return AjaxResult.success();
     }
 
     /**
      * 返回失败消息
+     *
+     * @return
      */
-    public AjaxResult error()
-    {
+    public AjaxResult error() {
         return AjaxResult.error();
     }
 
     /**
      * 返回成功消息
+     *
+     * @param message
+     * @return
      */
-    public AjaxResult success(String message)
-    {
+    public AjaxResult success(String message) {
         return AjaxResult.success(message);
     }
-    
 
     /**
      * 返回失败消息
+     *
+     * @param message
+     * @return
      */
-    public AjaxResult error(String message)
-    {
+    public AjaxResult error(String message) {
         return AjaxResult.error(message);
     }
 
     /**
      * 返回错误码消息
+     *
+     * @param code
+     * @param message
+     * @return
      */
-    public AjaxResult error(int code, String message)
-    {
+    public AjaxResult error(int code, String message) {
         return AjaxResult.error(code, message);
     }
-    
+
     /**
      * 返回object数据
+     *
+     * @param code
+     * @param data
+     * @return
      */
-    public AjaxResult retobject(int code, Object  data)
-    {
+    public AjaxResult retobject(int code, Object data) {
         return AjaxResult.successData(code, data);
     }
 
     /**
      * 页面跳转
+     *
+     * @param url
+     * @return
      */
-    public String redirect(String url)
-    {
-    	return StrUtil.format("redirect:{}", url);
+    public String redirect(String url) {
+        return StrUtil.format("redirect:{}", url);
     }
 
+    /**
+     * 设置请求分页数据
+     */
+    protected void startPage() {
+        Tablepar tablepar = Tablepar.buildPageRequest();
+
+        int pageNum = tablepar.getPage();
+        int pageSize = tablepar.getLimit();
+        if (pageNum != 0 && pageSize != 0) {
+            PageHelper.startPage(pageNum, pageSize, tablepar.getOrderByColumn());
+        }
+    }
 
-
-
-/**
-     * Describe: 返回 Tree 数据
-     * Param data
-     * Return Tree数据
-     * */
-    protected  static ResuTree dataTree(Object data){
-         ResuTree resuTree = new ResuTree();
-         resuTree.setData(data);
-         return resuTree;
+    /**
+     * 返回 Tree 数据
+     *
+     * @param data
+     * @return
+     */
+    protected static ResuTree dataTree(Object data) {
+        ResuTree resuTree = new ResuTree();
+        resuTree.setData(data);
+        return resuTree;
     }
+
     /**
-     * Describe: 返回数据表格数据 分页
-     * Param data
-     * Return 表格分页数据
-     * */
-    protected  static ResultTable pageTable(Object data, long count){
-        return ResultTable.pageTable(count,data);
+     * 返回数据表格数据
+     *
+     * @param data  表格分页数据
+     * @param count
+     * @return
+     */
+    protected static ResultTable pageTable(Object data, long count) {
+        return ResultTable.pageTable(count, data);
     }
 
     /**
-     * Describe: 返回数据表格数据
-     * Param data
-     * Return 表格分页数据
-     * */
-    protected  static ResultTable dataTable(Object data){
+     * 返回数据表格数据
+     *
+     * @param data 表格分页数据
+     * @return
+     */
+    protected static ResultTable dataTable(Object data) {
         return ResultTable.dataTable(data);
     }
 
     /**
-     * Describe: 返回树状表格数据 分页
-     * Param data
-     * Return 表格分页数据
-     * */
-    protected  static ResultTable treeTable(Object data){
+     * 返回树状表格数据
+     *
+     * @param data 表格分页数据
+     * @return
+     */
+    protected static ResultTable treeTable(Object data) {
         return ResultTable.dataTable(data);
     }
-    
-    
-    
-   
+
 }
diff --git a/src/main/java/com/fc/v2/common/domain/ResultTable.java b/src/main/java/com/fc/v2/common/domain/ResultTable.java
index 8161df0d5970c08ecc2c4a891311bdbe516697d0..45c68924d5ed0de87edee196e96eb0589dbe5c9b 100644
--- a/src/main/java/com/fc/v2/common/domain/ResultTable.java
+++ b/src/main/java/com/fc/v2/common/domain/ResultTable.java
@@ -1,24 +1,31 @@
 package com.fc.v2.common.domain;
 
+/**
+ * 分页结果的封装
+ *
+ * @author zhaonz
+ * @Date 20210815
+ */
 public class ResultTable {
-     /**
+
+    /**
      * 状态码
-     * */
+     */
     private Integer code;
 
     /**
      * 提示消息
-     * */
+     */
     private String msg;
 
     /**
      * 消息总量
-     * */
+     */
     private Long count;
 
     /**
      * 数据对象
-     * */
+     */
     private Object data;
 
     public Integer getCode() {
@@ -55,8 +62,12 @@ public class ResultTable {
 
     /**
      * 构 建
-     * */
-    public static ResultTable pageTable(long count,Object data){
+     *
+     * @param count
+     * @param data
+     * @return
+     */
+    public static ResultTable pageTable(long count, Object data) {
         ResultTable resultTable = new ResultTable();
         resultTable.setData(data);
         resultTable.setCode(0);
@@ -64,7 +75,11 @@ public class ResultTable {
         return resultTable;
     }
 
-    public static ResultTable dataTable(Object data){
+    /**
+     * @param data
+     * @return
+     */
+    public static ResultTable dataTable(Object data) {
         ResultTable resultTable = new ResultTable();
         resultTable.setData(data);
         resultTable.setCode(0);
diff --git a/src/main/java/com/fc/v2/controller/admin/ProvinceLinkageController.java b/src/main/java/com/fc/v2/controller/admin/ProvinceLinkageController.java
index 7611327950fa012f9c69993ad664507fadc1ad0a..1081dfa6f8ada0f839c29071eb9d2efad90fb9c6 100644
--- a/src/main/java/com/fc/v2/controller/admin/ProvinceLinkageController.java
+++ b/src/main/java/com/fc/v2/controller/admin/ProvinceLinkageController.java
@@ -29,17 +29,20 @@ import java.util.List;
 @Controller
 @RequestMapping("/ProvinceLinkageController")
 public class ProvinceLinkageController extends BaseController {
+
     @Autowired
     private ITSysProvinceService sysProvinceService;
+
     @Autowired
     private ITSysCityService sysCityService;
+
     @Autowired
     private ITSysAreaService sysAreaService;
 
     @Autowired
     private ITSysStreetService sysStreetService;
 
-    private String prefix = "admin/province";
+    private String prefix = "admin/sysProvince";
 
     /**
      * 分页list页面
@@ -101,6 +104,4 @@ public class ProvinceLinkageController extends BaseController {
         return sysStreetService.selectTSysStreetList(queryWrapper);
 
     }
-
-
 }
diff --git a/src/main/java/com/fc/v2/controller/admin/SysAreaController.java b/src/main/java/com/fc/v2/controller/admin/SysAreaController.java
index b8af90a64c0187a96a30ad244e8fec233a71dcd0..fcf9a4c0b2574abb8b23c035a2098f2039c94c05 100644
--- a/src/main/java/com/fc/v2/controller/admin/SysAreaController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysAreaController.java
@@ -3,13 +3,13 @@ package com.fc.v2.controller.admin;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fc.v2.common.base.BaseController;
 import com.fc.v2.common.domain.AjaxResult;
+import com.fc.v2.common.domain.ResultTable;
+import com.fc.v2.common.log.Log;
 import com.fc.v2.model.auto.TSysArea;
 import com.fc.v2.model.auto.TSysCity;
-import com.fc.v2.model.custom.Tablepar;
 import com.fc.v2.service.ITSysAreaService;
 import com.fc.v2.service.ITSysCityService;
 import com.fc.v2.util.StringUtils;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,7 +34,8 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/SysAreaController")
 public class SysAreaController extends BaseController {
 
-    private String prefix = "admin/province/sysArea";
+    private String prefix = "admin/sysProvince/sysArea";
+
     @Autowired
     private ITSysAreaService sysAreaService;
 
@@ -59,32 +60,29 @@ public class SysAreaController extends BaseController {
     /**
      * list集合
      *
-     * @param tablepar
-     * @param searchText
+     * @param tSysArea
      * @return
-     * @author fuce
-     * @Date 2019年11月11日 下午4:04:53
      */
-    //@Log(title = "地区设置集合查询", action = "111")
+    @Log(title = "地区设置集合查询", action = "list")
     @ApiOperation(value = "分页跳转", notes = "分页跳转")
     @GetMapping("/list")
     @RequiresPermissions("gen:sysArea:list")
     @ResponseBody
-    public Object list(Tablepar tablepar, String searchText) {
-
+    public ResultTable list(TSysArea tSysArea) {
         QueryWrapper<TSysArea> queryWrapper = new QueryWrapper<TSysArea>();
-        queryWrapper.orderByAsc("id");
-            	
-        queryWrapper.like(StringUtils.isNotEmpty(searchText), "area_name", searchText);
-
-        PageHelper.startPage(tablepar.getPage(), tablepar.getLimit());
+        queryWrapper.eq(StringUtils.isNotEmpty(tSysArea.getAreaCode()), "area_code", tSysArea.getAreaCode());
+        queryWrapper.like(StringUtils.isNotEmpty(tSysArea.getAreaName()), "area_name", tSysArea.getAreaName());
 
+        startPage();
         PageInfo<TSysArea> page = new PageInfo<TSysArea>(sysAreaService.selectTSysAreaList(queryWrapper));
         return pageTable(page.getList(), page.getTotal());
     }
 
     /**
      * 新增跳转
+     *
+     * @param modelMap
+     * @return
      */
     @ApiOperation(value = "新增跳转", notes = "新增跳转")
     @GetMapping("/add")
@@ -102,18 +100,13 @@ public class SysAreaController extends BaseController {
      * @author fuce
      * @Date 2019年11月11日 下午4:04:41
      */
-    //@Log(title = "地区设置新增", action = "111")
+    @Log(title = "地区设置新增", action = "add")
     @ApiOperation(value = "新增", notes = "新增")
     @PostMapping("/add")
     @RequiresPermissions("gen:sysArea:add")
     @ResponseBody
     public AjaxResult add(TSysArea sysArea) {
-        int b = sysAreaService.insertTSysArea(sysArea);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysAreaService.insertTSysArea(sysArea));
     }
 
     /**
@@ -122,18 +115,13 @@ public class SysAreaController extends BaseController {
      * @param ids
      * @return
      */
-    //@Log(title = "地区设置删除", action = "111")
+    @Log(title = "地区设置删除", action = "remove")
     @ApiOperation(value = "删除", notes = "删除")
     @DeleteMapping("/remove")
     @RequiresPermissions("gen:sysArea:remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        int b = sysAreaService.deleteTSysAreaByIds(ids);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysAreaService.deleteTSysAreaByIds(ids));
     }
 
     /**
@@ -146,12 +134,7 @@ public class SysAreaController extends BaseController {
     @PostMapping("/checkNameUnique")
     @ResponseBody
     public int checkNameUnique(TSysArea sysArea) {
-        int b = sysAreaService.checkNameUnique(sysArea);
-        if (b > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
+        return sysAreaService.checkNameUnique(sysArea) > 0 ? 1 : 0;
     }
 
 
@@ -173,8 +156,11 @@ public class SysAreaController extends BaseController {
 
     /**
      * 修改保存
+     *
+     * @param record
+     * @return
      */
-    //@Log(title = "地区设置修改", action = "111")
+    @Log(title = "地区设置修改", action = "editSave")
     @ApiOperation(value = "修改保存", notes = "修改保存")
     @RequiresPermissions("gen:sysArea:edit")
     @PostMapping("/edit")
@@ -182,6 +168,4 @@ public class SysAreaController extends BaseController {
     public AjaxResult editSave(TSysArea record) {
         return toAjax(sysAreaService.updateTSysArea(record));
     }
-
-
 }
diff --git a/src/main/java/com/fc/v2/controller/admin/SysCityController.java b/src/main/java/com/fc/v2/controller/admin/SysCityController.java
index 977daa05f1fd08aed34d50f93c9e7eedd677a164..0e4bd80ce221523373f625957a597548a5158f07 100644
--- a/src/main/java/com/fc/v2/controller/admin/SysCityController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysCityController.java
@@ -3,12 +3,13 @@ package com.fc.v2.controller.admin;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fc.v2.common.domain.ResultTable;
+import com.fc.v2.common.log.Log;
 import com.fc.v2.model.auto.TSysCity;
 import com.fc.v2.model.auto.TSysProvince;
 import com.fc.v2.service.ITSysCityService;
 import com.fc.v2.service.ITSysProvinceService;
 import com.fc.v2.util.StringUtils;
-import com.github.pagehelper.PageHelper;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -17,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 import com.github.pagehelper.PageInfo;
 import com.fc.v2.common.base.BaseController;
 import com.fc.v2.common.domain.AjaxResult;
-import com.fc.v2.model.custom.Tablepar;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,7 +34,8 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping("/SysCityController")
 public class SysCityController extends BaseController {
 
-    private String prefix = "admin/province/sysCity";
+    private String prefix = "admin/sysProvince/sysCity";
+
     @Autowired
     private ITSysCityService sysCityService;
 
@@ -57,23 +58,20 @@ public class SysCityController extends BaseController {
     /**
      * 城市设置list
      *
-     * @param tablepar
-     * @param searchText
+     * @param tSysCity
      * @return
      */
-    //@Log(title = "城市设置集合查询", action = "111")
+    @Log(title = "城市设置集合查询", action = "/list")
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/list")
     @RequiresPermissions("gen:sysCity:list")
     @ResponseBody
-    public Object list(Tablepar tablepar, String searchText) {
-
+    public ResultTable list(TSysCity tSysCity) {
         QueryWrapper<TSysCity> queryWrapper = new QueryWrapper<TSysCity>();
-        queryWrapper.orderByAsc("id");
-        queryWrapper.like(StringUtils.isNotEmpty(searchText), "city_name", searchText);
-
-        PageHelper.startPage(tablepar.getPage(), tablepar.getLimit());
+        queryWrapper.eq(StringUtils.isNotEmpty(tSysCity.getCityCode()), "city_code", tSysCity.getCityCode());
+        queryWrapper.like(StringUtils.isNotEmpty(tSysCity.getCityName()), "city_name", tSysCity.getCityName());
 
+        startPage();
         PageInfo<TSysCity> page = new PageInfo<TSysCity>(sysCityService.selectTSysCityList(queryWrapper));
         return pageTable(page.getList(), page.getTotal());
     }
@@ -98,18 +96,13 @@ public class SysCityController extends BaseController {
      * @param sysCity
      * @return
      */
-    //@Log(title = "城市设置新增", action = "111")
+    @Log(title = "城市设置新增", action = "add")
     @ApiOperation(value = "新增", notes = "新增")
     @PostMapping("/add")
     @RequiresPermissions("gen:sysCity:add")
     @ResponseBody
     public AjaxResult add(TSysCity sysCity) {
-        int b = sysCityService.insertTSysCity(sysCity);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysCityService.insertTSysCity(sysCity));
     }
 
     /**
@@ -118,36 +111,26 @@ public class SysCityController extends BaseController {
      * @param ids
      * @return
      */
-    //@Log(title = "城市设置删除", action = "111")
+    @Log(title = "城市设置删除", action = "remove")
     @ApiOperation(value = "删除", notes = "删除")
     @DeleteMapping("/remove")
     @RequiresPermissions("gen:sysCity:remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        int b = sysCityService.deleteTSysCityByIds(ids);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysCityService.deleteTSysCityByIds(ids));
     }
 
     /**
      * 检查
      *
-     * @param tsysUser
+     * @param sysCity
      * @return
      */
     @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一")
     @PostMapping("/checkNameUnique")
     @ResponseBody
     public int checkNameUnique(TSysCity sysCity) {
-        int b = sysCityService.checkNameUnique(sysCity);
-        if (b > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
+        return sysCityService.checkNameUnique(sysCity) > 0 ? 1 : 0;
     }
 
 
@@ -169,8 +152,11 @@ public class SysCityController extends BaseController {
 
     /**
      * 修改保存
+     *
+     * @param record
+     * @return
      */
-    //@Log(title = "城市设置修改", action = "111")
+    @Log(title = "城市设置修改", action = "editSave")
     @ApiOperation(value = "修改保存", notes = "修改保存")
     @RequiresPermissions("gen:sysCity:edit")
     @PostMapping("/edit")
@@ -178,6 +164,4 @@ public class SysCityController extends BaseController {
     public AjaxResult editSave(TSysCity record) {
         return toAjax(sysCityService.updateTSysCity(record));
     }
-
-
 }
diff --git a/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java b/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java
index bec4aef038e0cb10d2a515c88ef7d52ea8287714..2581e278cec7e814f519bcd365884234a3d905e3 100644
--- a/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java
@@ -1,12 +1,11 @@
 package com.fc.v2.controller.admin;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fc.v2.common.base.BaseController;
 import com.fc.v2.common.domain.AjaxResult;
 import com.fc.v2.common.domain.ResultTable;
+import com.fc.v2.common.log.Log;
 import com.fc.v2.model.auto.TSysDepartment;
-import com.fc.v2.model.custom.Tablepar;
 import com.fc.v2.common.domain.ResuTree;
 import com.fc.v2.service.ITSysDepartmentService;
 import com.fc.v2.util.StringUtils;
@@ -20,12 +19,19 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+/**
+ * 部门 controller
+ *
+ * @author fuce
+ * @date: 2018年9月30日 下午9:28:31
+ */
 @Api(value = "部门表")
 @Controller
 @RequestMapping("/SysDepartmentController")
 public class SysDepartmentController extends BaseController {
 
     private final String prefix = "admin/sysDepartment";
+
     @Autowired
     private ITSysDepartmentService sysDepartmentService;
 
@@ -45,27 +51,20 @@ public class SysDepartmentController extends BaseController {
     }
 
     /**
-     * 分页查询
+     * 部门查询, 不适用分页
      *
-     * @param tablepar
-     * @param searchText
+     * @param tSysDepartment
      * @return
-     * @author fuce
-     * @Date 2020年4月18日 下午11:48:34
      */
-    //@Log(title = "部门表集合查询", action = "111")
+    @Log(title = "部门表集合查询", action = "list")
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/list")
     @RequiresPermissions("gen:sysDepartment:list")
     @ResponseBody
-    public ResultTable list(Tablepar tablepar, String searchText) {
+    public ResultTable list(TSysDepartment tSysDepartment) {
         QueryWrapper<TSysDepartment> queryWrapper = new QueryWrapper<TSysDepartment>();
-        queryWrapper.orderByAsc("id");
-        queryWrapper.like(StringUtils.isNotEmpty(searchText), "dept_name", searchText);
-
-        if (StrUtil.isNotEmpty(tablepar.getOrderByColumn())) {
-            queryWrapper.orderByAsc(tablepar.getOrderByColumn());
-        }
+        queryWrapper.orderByAsc("order_num");
+        queryWrapper.like(StringUtils.isNotEmpty(tSysDepartment.getDeptName()), "dept_name", tSysDepartment.getDeptName());
 
         List<TSysDepartment> list = sysDepartmentService.selectTSysDepartmentList(queryWrapper);
         return treeTable(list);
@@ -91,18 +90,13 @@ public class SysDepartmentController extends BaseController {
      * @author fuce
      * @Date 2020年4月18日 下午11:47:51
      */
-    //@Log(title = "部门表新增", action = "111")
+    @Log(title = "部门表新增", action = "add")
     @ApiOperation(value = "新增", notes = "新增")
     @PostMapping("/add")
     @RequiresPermissions("gen:sysDepartment:add")
     @ResponseBody
     public AjaxResult add(@RequestBody TSysDepartment sysDepartment) {
-        int b = sysDepartmentService.insertTSysDepartment(sysDepartment);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysDepartmentService.insertTSysDepartment(sysDepartment));
     }
 
     /**
@@ -111,18 +105,13 @@ public class SysDepartmentController extends BaseController {
      * @param ids
      * @return
      */
-    //@Log(title = "部门表删除", action = "111")
+    @Log(title = "部门表删除", action = "remove")
     @ApiOperation(value = "删除", notes = "删除")
     @DeleteMapping("/remove")
     @RequiresPermissions("gen:sysDepartment:remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        int b = sysDepartmentService.deleteTSysDepartmentByIds(ids);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysDepartmentService.deleteTSysDepartmentByIds(ids));
     }
 
     /**
@@ -135,12 +124,7 @@ public class SysDepartmentController extends BaseController {
     @PostMapping("/checkNameUnique")
     @ResponseBody
     public int checkNameUnique(TSysDepartment sysDepartment) {
-        int b = sysDepartmentService.checkNameUnique(sysDepartment);
-        if (b > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
+        return sysDepartmentService.checkNameUnique(sysDepartment) > 0 ? 1 : 0;
     }
 
 
@@ -156,7 +140,6 @@ public class SysDepartmentController extends BaseController {
     public String edit(@PathVariable("id") Long id, ModelMap mmap) {
         //获取自己的权限信息
         TSysDepartment mytsysPermission = sysDepartmentService.selectTSysDepartmentById(id);
-
         mmap.put("SysDepartment", mytsysPermission);
         return prefix + "/edit";
     }
@@ -167,7 +150,7 @@ public class SysDepartmentController extends BaseController {
      * @param record
      * @return
      */
-    //@Log(title = "部门表修改", action = "111")
+    @Log(title = "部门表修改", action = "editSave")
     @ApiOperation(value = "修改保存", notes = "修改保存")
     @RequiresPermissions("gen:sysDepartment:edit")
     @PutMapping("/edit")
@@ -192,7 +175,6 @@ public class SysDepartmentController extends BaseController {
      * 根据主键查询
      *
      * @param id
-     * @param mmap
      * @return
      */
     @PostMapping("/get/{id}")
@@ -223,7 +205,6 @@ public class SysDepartmentController extends BaseController {
     @PutMapping("/updateVisible")
     @ResponseBody
     public AjaxResult updateVisible(@RequestBody TSysDepartment record) {
-        int i = sysDepartmentService.updateVisible(record);
-        return toAjax(i);
+        return toAjax(sysDepartmentService.updateVisible(record));
     }
 }
diff --git a/src/main/java/com/fc/v2/controller/admin/DictDataController.java b/src/main/java/com/fc/v2/controller/admin/SysDictDataController.java
similarity index 61%
rename from src/main/java/com/fc/v2/controller/admin/DictDataController.java
rename to src/main/java/com/fc/v2/controller/admin/SysDictDataController.java
index 42a42f2791e850d13511586a90dc81910bee7932..e0c3f41fe3adeac6c9bffd8467f1738d2f3710af 100644
--- a/src/main/java/com/fc/v2/controller/admin/DictDataController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysDictDataController.java
@@ -3,23 +3,22 @@ package com.fc.v2.controller.admin;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fc.v2.common.base.BaseController;
 import com.fc.v2.common.domain.AjaxResult;
+import com.fc.v2.common.domain.ResultTable;
+import com.fc.v2.common.log.Log;
 import com.fc.v2.model.auto.TSysDictData;
-import com.fc.v2.model.auto.TSysDictType;
-import com.fc.v2.model.custom.Tablepar;
 import com.fc.v2.service.ITSysDictDataService;
-import com.fc.v2.service.ITSysDictTypeService;
 import com.fc.v2.util.StringUtils;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 字典表Controller
  *
@@ -30,56 +29,47 @@ import org.springframework.web.bind.annotation.*;
 @Api(value = "字典数据表")
 @Controller
 @RequestMapping("/DictDataController")
-public class DictDataController extends BaseController {
+public class SysDictDataController extends BaseController {
+
+	private final String prefix = "admin/sysDictData";
 
-	private final String prefix = "admin/dict_data";
 	@Autowired
 	private ITSysDictDataService tSysDictDataService;
-	@Autowired
-	private ITSysDictTypeService sysDictTypeService;
 
 	/**
 	 * 分页list页面
 	 *
 	 * @param model
-	 * @param dictId
+	 * @param tSysDictData
 	 * @return
 	 */
 	@ApiOperation(value = "分页跳转", notes = "分页跳转")
 	@GetMapping("/view")
 	@RequiresPermissions("system:dictData:view")
-	public String view(ModelMap model, String dictId) {
-		model.addAttribute("dictId", dictId);
+	public String view(ModelMap model, TSysDictData tSysDictData) {
+		model.addAttribute("dictType", tSysDictData.getDictType());
 		return prefix + "/list";
 	}
 
 	/**
 	 * 字典数据表集合查询
 	 *
-	 * @param tablepar
-	 * @param searchText
-	 * @param dictId
+	 * @param tSysDictData
 	 * @return
 	 */
-	// @Log(title = "字典数据表集合查询", action = "1")
+	@Log(title = "字典数据表集合查询", action = "list")
 	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping("/list")
 	@RequiresPermissions("system:dictData:list")
 	@ResponseBody
-	public Object list(Tablepar tablepar, String searchText, Long dictId) {
+	public ResultTable list(TSysDictData tSysDictData) {
 		QueryWrapper<TSysDictData> queryWrapper = new QueryWrapper<TSysDictData>();
-		queryWrapper.orderByAsc("DICT_SORT");
-
-		if (dictId != null && dictId != 0) {
-			TSysDictType dictType = sysDictTypeService.selectTSysDictTypeById(dictId);
-			queryWrapper.eq(dictType != null, "dict_type", dictType.getDictType());
-		}
-		
-		queryWrapper.like(StringUtils.isNotEmpty(searchText), "dict_value", searchText);
+		queryWrapper.eq(StringUtils.isNotEmpty(tSysDictData.getDictType()),"dict_type", tSysDictData.getDictType());
+		queryWrapper.like(StringUtils.isNotEmpty(tSysDictData.getDictValue()),"dict_value", tSysDictData.getDictValue());
+		queryWrapper.eq(StringUtils.isNotEmpty(tSysDictData.getStatus()),"status", tSysDictData.getStatus());
 
-		PageHelper.startPage(tablepar.getPage(), tablepar.getLimit());
-		PageInfo<TSysDictData> page = new PageInfo<TSysDictData>(
-				tSysDictDataService.selectTSysDictDataList(queryWrapper));
+		startPage();
+		PageInfo<TSysDictData> page = new PageInfo<TSysDictData>(tSysDictDataService.selectTSysDictDataList(queryWrapper));
 		return pageTable(page.getList(), page.getTotal());
 	}
 
@@ -87,13 +77,13 @@ public class DictDataController extends BaseController {
 	 * 新增跳转
 	 *
 	 * @param modelMap
-	 * @param dictId
+	 * @param tSysDictData
 	 * @return
 	 */
 	@ApiOperation(value = "新增跳转", notes = "新增跳转")
 	@GetMapping("/add")
-	public String add(ModelMap modelMap, Long dictId) {
-		modelMap.addAttribute("dictType", sysDictTypeService.selectTSysDictTypeById(dictId).getDictType());
+	public String add(ModelMap modelMap, TSysDictData tSysDictData) {
+		modelMap.addAttribute("dictType", tSysDictData.getDictType());
 		return prefix + "/add";
 	}
 
@@ -101,21 +91,21 @@ public class DictDataController extends BaseController {
 	 * 新增保存
 	 *
 	 * @param tSysDictData
-	 * @param model
 	 * @return
 	 */
-	// @Log(title = "字典数据表新增", action = "1")
+	@Log(title = "字典数据表新增", action = "add")
 	@ApiOperation(value = "新增", notes = "新增")
 	@PostMapping("/add")
 	@RequiresPermissions("system:dictData:add")
 	@ResponseBody
-	public AjaxResult add(TSysDictData tSysDictData, Model model) {
-		int b = tSysDictDataService.insertTSysDictData(tSysDictData);
-		if (b > 0) {
-			return success();
-		} else {
-			return error();
+	public AjaxResult add(TSysDictData tSysDictData) {
+		QueryWrapper<TSysDictData> queryWrapper = new QueryWrapper<TSysDictData>();
+		queryWrapper.like(StringUtils.isNotEmpty(tSysDictData.getDictValue()),"dict_value", tSysDictData.getDictValue());
+		List<TSysDictData> sysDictDatas = tSysDictDataService.selectTSysDictDataList(queryWrapper);
+		if (sysDictDatas.size() != 0){
+			return error("字典键值重复");
 		}
+		return toAjax(tSysDictDataService.insertTSysDictData(tSysDictData));
 	}
 
 	/**
@@ -124,36 +114,26 @@ public class DictDataController extends BaseController {
 	 * @param ids
 	 * @return
 	 */
-	// @Log(title = "字典数据表删除", action = "1")
+	@Log(title = "字典数据表删除", action = "remove")
 	@ApiOperation(value = "删除", notes = "删除")
 	@DeleteMapping("/remove")
 	@RequiresPermissions("system:dictData:remove")
 	@ResponseBody
 	public AjaxResult remove(String ids) {
-		int b = tSysDictDataService.deleteTSysDictDataByIds(ids);
-		if (b > 0) {
-			return success();
-		} else {
-			return error();
-		}
+		return toAjax(tSysDictDataService.deleteTSysDictDataByIds(ids));
 	}
 
 	/**
 	 * 检查
 	 *
-	 * @param tsysUser
+	 * @param tSysDictData
 	 * @return
 	 */
 	@ApiOperation(value = "检查Name唯一", notes = "检查Name唯一")
 	@PostMapping("/checkNameUnique")
 	@ResponseBody
 	public int checkNameUnique(TSysDictData tSysDictData) {
-		int b = tSysDictDataService.checkNameUnique(tSysDictData);
-		if (b > 0) {
-			return 1;
-		} else {
-			return 0;
-		}
+		return tSysDictDataService.checkNameUnique(tSysDictData) > 0 ? 1 : 0;
 	}
 
 	/**
@@ -177,7 +157,7 @@ public class DictDataController extends BaseController {
 	 * @param record
 	 * @return
 	 */
-	// @Log(title = "字典数据表修改", action = "1")
+	@Log(title = "字典数据表修改", action = "edit")
 	@ApiOperation(value = "修改保存", notes = "修改保存")
 	@RequiresPermissions("system:dictData:edit")
 	@PostMapping("/edit")
@@ -195,8 +175,7 @@ public class DictDataController extends BaseController {
 	@PutMapping("/updateDefault")
 	@ResponseBody
 	public AjaxResult updateDefault(@RequestBody TSysDictData record) {
-		int i = tSysDictDataService.updateTSysDictData(record);
-		return toAjax(i);
+		return toAjax(tSysDictDataService.updateTSysDictData(record));
 	}
 
 	/**
@@ -208,7 +187,6 @@ public class DictDataController extends BaseController {
 	@PutMapping("/updateEnable")
 	@ResponseBody
 	public AjaxResult updateEnable(@RequestBody TSysDictData record) {
-		int i = tSysDictDataService.updateTSysDictData(record);
-		return toAjax(i);
+		return toAjax(tSysDictDataService.updateTSysDictData(record));
 	}
 }
diff --git a/src/main/java/com/fc/v2/controller/admin/DictTypeController.java b/src/main/java/com/fc/v2/controller/admin/SysDictTypeController.java
similarity index 69%
rename from src/main/java/com/fc/v2/controller/admin/DictTypeController.java
rename to src/main/java/com/fc/v2/controller/admin/SysDictTypeController.java
index 67bda458de120fcb036e7c83bdaf631ca617b7e5..743e826fee13c1cac626d60d9ba2533a7bce5b82 100644
--- a/src/main/java/com/fc/v2/controller/admin/DictTypeController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysDictTypeController.java
@@ -4,21 +4,21 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fc.v2.common.base.BaseController;
 import com.fc.v2.common.domain.AjaxResult;
 import com.fc.v2.common.domain.ResultTable;
+import com.fc.v2.common.log.Log;
 import com.fc.v2.model.auto.TSysDictType;
-import com.fc.v2.model.custom.Tablepar;
 import com.fc.v2.service.ITSysDictTypeService;
 import com.fc.v2.util.StringUtils;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 字典类型Controller
  *
@@ -29,9 +29,9 @@ import org.springframework.web.bind.annotation.*;
 @Api(value = "字典类型表")
 @Controller
 @RequestMapping("/DictTypeController")
-public class DictTypeController extends BaseController {
+public class SysDictTypeController extends BaseController {
 
-	private final String prefix = "admin/dict_type";
+	private final String prefix = "admin/sysDictType";
 
 	@Autowired
 	private ITSysDictTypeService tSysDictTypeService;
@@ -52,23 +52,21 @@ public class DictTypeController extends BaseController {
 	/**
 	 * 字典类型表集合查询
 	 *
-	 * @param tablepar   post参数
-	 * @param searchText 查询字段
-	 * @return ResultTable 集合
+	 * @param tSysDictType
+	 * @return
 	 */
-	// @Log(title = "字典类型表集合查询", action = "111")
+	@Log(title = "字典类型表集合查询", action = "list")
 	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping("/list")
 	@RequiresPermissions("system:dictType:list")
 	@ResponseBody
-	public ResultTable list(Tablepar tablepar, String searchText) {
-		
+	public ResultTable list(TSysDictType tSysDictType) {
 		QueryWrapper<TSysDictType> queryWrapper = new QueryWrapper<TSysDictType>();
-		queryWrapper.like(StringUtils.isNotEmpty(searchText), "dict_name", searchText);
+		queryWrapper.like(StringUtils.isNotEmpty(tSysDictType.getDictName()), "dict_name", tSysDictType.getDictName());
+		queryWrapper.eq(StringUtils.isNotEmpty(tSysDictType.getStatus()), "status",tSysDictType.getStatus());
 
-		PageHelper.startPage(tablepar.getPage(), tablepar.getLimit());
-		PageInfo<TSysDictType> page = new PageInfo<TSysDictType>(
-				tSysDictTypeService.selectTSysDictTypeList(queryWrapper));
+		startPage();
+		PageInfo<TSysDictType> page = new PageInfo<TSysDictType>(tSysDictTypeService.selectTSysDictTypeList(queryWrapper));
 		return pageTable(page.getList(), page.getTotal());
 	}
 
@@ -88,21 +86,21 @@ public class DictTypeController extends BaseController {
 	 * 新增保存
 	 *
 	 * @param tSysDictType 字段类型
-	 * @param model        model
 	 * @return AjaxResult 对象
 	 */
-	// @Log(title = "字典类型表新增", action = "111")
+	@Log(title = "字典类型表新增", action = "add")
 	@ApiOperation(value = "新增", notes = "新增")
 	@PostMapping("/add")
 	@RequiresPermissions("system:dictType:add")
 	@ResponseBody
-	public AjaxResult add(TSysDictType tSysDictType, Model model) {
-		int b = tSysDictTypeService.insertTSysDictType(tSysDictType);
-		if (b > 0) {
-			return success();
-		} else {
-			return error();
+	public AjaxResult add(TSysDictType tSysDictType) {
+		QueryWrapper<TSysDictType> queryWrapper = new QueryWrapper<TSysDictType>();
+		queryWrapper.eq(StringUtils.isNotEmpty(tSysDictType.getDictType()), "dict_type", tSysDictType.getDictType());
+		List<TSysDictType> tSysDictTypes = tSysDictTypeService.selectTSysDictTypeList(queryWrapper);
+		if (tSysDictTypes.size() != 0){
+			return error("字典类型重复");
 		}
+		return toAjax(tSysDictTypeService.insertTSysDictType(tSysDictType));
 	}
 
 	/**
@@ -111,18 +109,13 @@ public class DictTypeController extends BaseController {
 	 * @param ids
 	 * @return
 	 */
-	// @Log(title = "字典类型表删除", action = "111")
+	@Log(title = "字典类型表删除", action = "remove")
 	@ApiOperation(value = "删除", notes = "删除")
 	@DeleteMapping("/remove")
 	@RequiresPermissions("system:dictType:remove")
 	@ResponseBody
 	public AjaxResult remove(String ids) {
-		int b = tSysDictTypeService.deleteTSysDictTypeByIds(ids);
-		if (b > 0) {
-			return success();
-		} else {
-			return error();
-		}
+		return toAjax(tSysDictTypeService.deleteTSysDictTypeByIds(ids));
 	}
 
 	/**
@@ -135,12 +128,7 @@ public class DictTypeController extends BaseController {
 	@PostMapping("/checkNameUnique")
 	@ResponseBody
 	public int checkNameUnique(TSysDictType tSysDictType) {
-		int b = tSysDictTypeService.checkNameUnique(tSysDictType);
-		if (b > 0) {
-			return 1;
-		} else {
-			return 0;
-		}
+		return tSysDictTypeService.checkNameUnique(tSysDictType) > 0 ? 1 : 0;
 	}
 
 	/**
@@ -163,7 +151,7 @@ public class DictTypeController extends BaseController {
 	 * @param record
 	 * @return
 	 */
-	// @Log(title = "字典类型表修改", action = "111")
+	@Log(title = "字典类型表修改", action = "edit")
 	@ApiOperation(value = "修改保存", notes = "修改保存")
 	@RequiresPermissions("system:dictType:edit")
 	@PostMapping("/edit")
@@ -181,7 +169,6 @@ public class DictTypeController extends BaseController {
 	@PutMapping("/updateEnable")
 	@ResponseBody
 	public AjaxResult updateEnable(@RequestBody TSysDictType record) {
-		int i = tSysDictTypeService.updateTSysDictType(record);
-		return toAjax(i);
+		return toAjax(tSysDictTypeService.updateTSysDictType(record));
 	}
 }
diff --git a/src/main/java/com/fc/v2/controller/admin/EmailController.java b/src/main/java/com/fc/v2/controller/admin/SysEmailController.java
similarity index 78%
rename from src/main/java/com/fc/v2/controller/admin/EmailController.java
rename to src/main/java/com/fc/v2/controller/admin/SysEmailController.java
index 66007269a6a489d95b832184583f42a909a5bf64..b2366c0943feaaf85cb4b6ee2ba2f9de90dcfa70 100644
--- a/src/main/java/com/fc/v2/controller/admin/EmailController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysEmailController.java
@@ -5,12 +5,11 @@ import com.fc.v2.common.base.BaseController;
 import com.fc.v2.common.conf.oss.OssTemplate;
 import com.fc.v2.common.domain.AjaxResult;
 import com.fc.v2.common.domain.ResultTable;
+import com.fc.v2.common.log.Log;
 import com.fc.v2.model.auto.TSysEmail;
-import com.fc.v2.model.custom.Tablepar;
 import com.fc.v2.service.ITSysEmailService;
 import com.fc.v2.util.SimpleEmailUtil;
 import com.fc.v2.util.StringUtils;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,9 +31,12 @@ import org.springframework.web.bind.annotation.*;
 @Api(value = "邮件发送Controller")
 @Controller
 @RequestMapping("/EmailController")
-public class EmailController extends BaseController {
+public class SysEmailController extends BaseController {
 
-    private final String prefix = "admin/email";
+    /**
+     * 跳转页面参数
+     */
+    private final String prefix = "admin/sysEmail";
 
     @Autowired
     private ITSysEmailService tSysEmailService;
@@ -58,21 +60,19 @@ public class EmailController extends BaseController {
     /**
      * 分页list页面
      *
-     * @param tablepar
-     * @param searchText
+     * @param tSysEmail
      * @return
      */
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/list")
     @RequiresPermissions("system:email:list")
     @ResponseBody
-    public ResultTable list(Tablepar tablepar, String searchText) {
+    public ResultTable list(TSysEmail tSysEmail) {
         QueryWrapper<TSysEmail> queryWrapper = new QueryWrapper<TSysEmail>();
-        queryWrapper.orderByDesc("id");        
-        queryWrapper.like(StringUtils.isNotEmpty(searchText), "content", searchText);
-        
-        PageHelper.startPage(tablepar.getPage(), tablepar.getLimit());
+        queryWrapper.like(StringUtils.isNotEmpty(tSysEmail.getTitle()), "title", tSysEmail.getTitle());
+        queryWrapper.eq(StringUtils.isNotEmpty(tSysEmail.getCreateBy()),"create_by",tSysEmail.getCreateBy());
 
+        startPage();
         PageInfo<TSysEmail> page =  new PageInfo<TSysEmail>(tSysEmailService.selectTSysEmailList(queryWrapper));
         return pageTable(page.getList(), page.getTotal());
     }
@@ -96,20 +96,19 @@ public class EmailController extends BaseController {
      * @throws Exception
      * @author fuce
      */
-    //@Log(title = "新增邮件", action = "1")
+    @Log(title = "新增邮件", action = "add")
     @ApiOperation(value = "新增", notes = "新增")
     @PostMapping("/add")
     @RequiresPermissions("system:email:add")
     @ResponseBody
     public AjaxResult add(@RequestBody TSysEmail tSysEmail, Model model) throws Exception {
-        int b = tSysEmailService.insertTSysEmail(tSysEmail);
-        if (b > 0) {
+        if (tSysEmailService.insertTSysEmail(tSysEmail) > 0){
             //发送邮件
             SimpleEmailUtil.sendEmail(tSysEmail);
             return success();
-        } else {
-            return error();
         }
+
+        return error();
     }
 
     /**
@@ -118,18 +117,13 @@ public class EmailController extends BaseController {
      * @param ids
      * @return
      */
-    //@Log(title = "删除邮件", action = "1")
+    @Log(title = "删除邮件", action = "remove")
     @ApiOperation(value = "删除", notes = "删除")
     @DeleteMapping("/remove")
     @RequiresPermissions("system:email:remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        int b = tSysEmailService.deleteTSysEmailByIds(ids);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(tSysEmailService.deleteTSysEmailByIds(ids));
     }
 
     /**
@@ -142,12 +136,7 @@ public class EmailController extends BaseController {
     @PostMapping("/checkNameUnique")
     @ResponseBody
     public int checkNameUnique(TSysEmail tSysEmail) {
-        int b = tSysEmailService.checkNameUnique(tSysEmail);
-        if (b > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
+        return tSysEmailService.checkNameUnique(tSysEmail) > 0 ? 1 : 0;
     }
 
 
@@ -165,6 +154,4 @@ public class EmailController extends BaseController {
         mmap.put("TSysEmail", tSysEmailService.selectTSysEmailById(id));
         return prefix + "/view";
     }
-
-
 }
diff --git a/src/main/java/com/fc/v2/controller/admin/FileController.java b/src/main/java/com/fc/v2/controller/admin/SysFileController.java
similarity index 77%
rename from src/main/java/com/fc/v2/controller/admin/FileController.java
rename to src/main/java/com/fc/v2/controller/admin/SysFileController.java
index 6fdad661d1550c46384df5c85d9bc98cd25f0909..90316cd13990906d214b637c4e13e9173d47dc5f 100644
--- a/src/main/java/com/fc/v2/controller/admin/FileController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysFileController.java
@@ -3,8 +3,9 @@ package com.fc.v2.controller.admin;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fc.v2.common.conf.oss.OssTemplate;
 import com.fc.v2.common.domain.AjaxResult;
+import com.fc.v2.common.domain.ResultTable;
+import com.fc.v2.common.log.Log;
 import com.fc.v2.model.auto.TSysFile;
-import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -13,7 +14,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 import com.fc.v2.common.base.BaseController;
-import com.fc.v2.model.custom.Tablepar;
 import com.fc.v2.util.StringUtils;
 import com.github.pagehelper.PageInfo;
 
@@ -26,10 +26,12 @@ import com.github.pagehelper.PageInfo;
 @Api(value = "文件上传")
 @Controller
 @RequestMapping("/FileController")
-public class FileController extends BaseController {
+public class SysFileController extends BaseController {
 
-    //跳转页面参数
-    private final String prefix = "admin/file";
+    /**
+     * 跳转页面参数
+     */
+    private final String prefix = "admin/sysFile";
 
     @Autowired
     private OssTemplate template;
@@ -53,22 +55,19 @@ public class FileController extends BaseController {
     /**
      * 文件列表
      *
-     * @param tablepar
-     * @param searchText 搜索字符
+     * @param tSysFile
      * @return
      */
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/list")
     @RequiresPermissions("system:file:list")
     @ResponseBody
-    public Object list(Tablepar tablepar, String searchText) {
-
+    public ResultTable list(TSysFile tSysFile) {
         QueryWrapper<TSysFile> queryWrapper = new QueryWrapper<TSysFile>();
-        queryWrapper.orderByAsc("id");
-        queryWrapper.like(StringUtils.isNotEmpty(searchText), "file_name", searchText);
-
-        PageHelper.startPage(tablepar.getPage(), tablepar.getLimit());
-
+        queryWrapper.eq(StringUtils.isNotEmpty(tSysFile.getCreateBy()), "create_by", tSysFile.getCreateBy());
+        queryWrapper.like(StringUtils.isNotEmpty(tSysFile.getFileName()), "file_name", tSysFile.getFileName());
+        
+        startPage();
         PageInfo<TSysFile> page = new PageInfo<TSysFile>(sysFileService.selectTSysFileList(queryWrapper));
         return pageTable(page.getList(), page.getTotal());
     }
@@ -98,12 +97,7 @@ public class FileController extends BaseController {
     @PostMapping("/checkNameUnique")
     @ResponseBody
     public int checkNameUnique(TSysFile tsysFile) {
-        int b = sysFileService.checkNameUnique(tsysFile);
-        if (b > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
+        return sysFileService.checkNameUnique(tsysFile) > 0 ? 1 : 0;
     }
 
 
@@ -111,7 +105,7 @@ public class FileController extends BaseController {
      * 修改文件
      *
      * @param id
-     * @param mmap
+     * @param map
      * @return
      */
     @ApiOperation(value = "修改跳转", notes = "修改跳转")
@@ -129,19 +123,12 @@ public class FileController extends BaseController {
      * @param ids
      * @return
      */
-    //@Log(title = "删除日志", action = "1")
+    @Log(title = "删除日志", action = "remove")
     @ApiOperation(value = "删除", notes = "删除")
     @DeleteMapping("/remove")
     @RequiresPermissions("system:file:remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        int b = sysFileService.deleteTSysFileByIds(ids);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysFileService.deleteTSysFileByIds(ids));
     }
-
-
 }
diff --git a/src/main/java/com/fc/v2/controller/admin/SysNoticeController.java b/src/main/java/com/fc/v2/controller/admin/SysNoticeController.java
index 9611dd3666dc3eef4b87fa213ad1ebea88abf47e..de83d1446caf4c1d5a1d20dc3fd5afa3c990a590 100644
--- a/src/main/java/com/fc/v2/controller/admin/SysNoticeController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysNoticeController.java
@@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fc.v2.common.base.BaseController;
 import com.fc.v2.common.domain.AjaxResult;
 import com.fc.v2.common.domain.ResultTable;
+import com.fc.v2.common.log.Log;
 import com.fc.v2.model.auto.TSysNotice;
 import com.fc.v2.model.custom.Tablepar;
 import com.fc.v2.service.ITSysNoticeService;
 import com.fc.v2.shiro.util.ShiroUtils;
 import com.fc.v2.util.StringUtils;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
 public class SysNoticeController extends BaseController {
 
     private final String prefix = "admin/sysNotice";
+
     @Autowired
     private ITSysNoticeService sysNoticeService;
 
@@ -54,23 +55,20 @@ public class SysNoticeController extends BaseController {
     /**
      * list页面
      *
-     * @param tablepar
-     * @param searchText
+     * @param tSysNotice
      * @return
-     * @author fuce
-     * @Date 2019年11月11日 下午4:09:35
      */
-    //@Log(title = "公告集合查询", action = "111")
+    @Log(title = "公告集合查询", action = "/list")
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/list")
     @RequiresPermissions("gen:sysNotice:list")
     @ResponseBody
-    public ResultTable list(Tablepar tablepar, String searchText) {
+    public ResultTable list(TSysNotice tSysNotice) {
         QueryWrapper<TSysNotice> queryWrapper = new QueryWrapper<TSysNotice>();
-        queryWrapper.orderByAsc("id");
-        queryWrapper.like(StringUtils.isNotEmpty(searchText), "title", searchText);
+        queryWrapper.like(StringUtils.isNotEmpty(tSysNotice.getTitle()), "title", tSysNotice.getTitle());
+        queryWrapper.eq(StringUtils.isNotEmpty(tSysNotice.getCreateBy()), "create_by", tSysNotice.getCreateBy());
 
-        PageHelper.startPage(tablepar.getPage(), tablepar.getLimit());
+        startPage();
         PageInfo<TSysNotice> page =  new PageInfo<TSysNotice>(sysNoticeService.selectTSysNoticeList(queryWrapper));
         return pageTable(page.getList(), page.getTotal());
     }
@@ -125,7 +123,7 @@ public class SysNoticeController extends BaseController {
      * @author fuce
      * @Date 2019年11月11日 下午4:07:09
      */
-    //@Log(title = "公告新增", action = "111")
+    @Log(title = "公告新增", action = "/add")
     @ApiOperation(value = "新增", notes = "新增")
     @PostMapping("/add")
     @RequiresPermissions("gen:sysNotice:add")
@@ -145,7 +143,7 @@ public class SysNoticeController extends BaseController {
      * @param ids
      * @return
      **/
-    //@Log(title = "公告删除", action = "111")
+    @Log(title = "公告删除", action = "/remove")
     @ApiOperation(value = "删除", notes = "删除")
     @DeleteMapping("/remove")
     @RequiresPermissions("gen:sysNotice:remove")
@@ -162,7 +160,7 @@ public class SysNoticeController extends BaseController {
     /**
      * 检查
      *
-     * @param tsysUser
+     * @param sysNotice
      * @return
      */
     @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一")
@@ -184,7 +182,7 @@ public class SysNoticeController extends BaseController {
      * @param mmap
      * @return
      */
-    //@Log(title = "字典数据表删除", action = "1")
+    @Log(title = "字典数据表删除", action = "/viewinfo")
     @ApiOperation(value = "根据公告id查询跳转到公告详情页面", notes = " 根据公告id查询跳转到公告详情页面")
     @GetMapping("/viewinfo/{id}")
     public String viewinfo(@PathVariable("id") Long id, ModelMap mmap) {
@@ -214,7 +212,7 @@ public class SysNoticeController extends BaseController {
     /**
      * 修改保存
      */
-    //@Log(title = "公告修改", action = "111")
+    @Log(title = "公告修改", action = "/edit")
     @ApiOperation(value = "修改保存", notes = "修改保存")
     @RequiresPermissions("gen:sysNotice:edit")
     @PostMapping("/edit")
diff --git a/src/main/java/com/fc/v2/controller/admin/LogController.java b/src/main/java/com/fc/v2/controller/admin/SysOperLogController.java
similarity index 60%
rename from src/main/java/com/fc/v2/controller/admin/LogController.java
rename to src/main/java/com/fc/v2/controller/admin/SysOperLogController.java
index dc3bffa24be3f45e6c629f96005c18421a38d476..0bfc38d193a7992d289fc1c7904b0ba207cd2d82 100644
--- a/src/main/java/com/fc/v2/controller/admin/LogController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysOperLogController.java
@@ -4,10 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fc.v2.common.base.BaseController;
 import com.fc.v2.common.domain.AjaxResult;
 import com.fc.v2.common.domain.ResultTable;
+import com.fc.v2.common.log.Log;
 import com.fc.v2.model.auto.TSysOperLog;
-import com.fc.v2.model.custom.Tablepar;
 import com.fc.v2.util.StringUtils;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,10 +24,12 @@ import org.springframework.web.bind.annotation.*;
 @Controller
 @Api(value = "日志记录")
 @RequestMapping("/LogController")
-public class LogController extends BaseController {
+public class SysOperLogController extends BaseController {
 
-    //跳转页面参数
-    private final String prefix = "admin/log";
+    /**
+     * 跳转页面参数
+     */
+    private final String prefix = "admin/sysOperLog";
 
     /**
      * 日志记录展示页面
@@ -44,22 +45,21 @@ public class LogController extends BaseController {
     }
 
     /**
-     * 文件列表
+     * 日志列表
      *
-     * @param tablepar
-     * @param searchText 搜索字符
+     * @param tSysOperLog
      * @return
      */
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/list")
     @RequiresPermissions("system:log:list")
     @ResponseBody
-    public ResultTable list(Tablepar tablepar, String searchText) {
-		QueryWrapper<TSysOperLog> queryWrapper = new QueryWrapper<TSysOperLog>();
-		queryWrapper.orderByDesc("id");
-		queryWrapper.like(StringUtils.isNotEmpty(searchText), "title", searchText);
+    public ResultTable list(TSysOperLog tSysOperLog) {
+        QueryWrapper<TSysOperLog> queryWrapper = new QueryWrapper<TSysOperLog>();
+        queryWrapper.like(StringUtils.isNotEmpty(tSysOperLog.getTitle()), "title", tSysOperLog.getTitle());
+        queryWrapper.eq(StringUtils.isNotEmpty(tSysOperLog.getOperName()), "oper_name", tSysOperLog.getOperName());
 
-		PageHelper.startPage(tablepar.getPage(), tablepar.getLimit());
+        startPage();
         PageInfo<TSysOperLog> page = new PageInfo<TSysOperLog>(sysOperLogService.selectTSysOperLogList(queryWrapper));
         return pageTable(page.getList(), page.getTotal());
     }
@@ -71,17 +71,27 @@ public class LogController extends BaseController {
      * @param ids
      * @return
      */
-    //@Log(title = "删除日志", action = "1")
+    @Log(title = "删除日志", action = "remove")
     @ApiOperation(value = "删除", notes = "删除")
     @DeleteMapping("/remove")
     @RequiresPermissions("system:log:remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        int b = sysOperLogService.deleteTSysOperLogByIds(ids);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysOperLogService.deleteTSysOperLogByIds(ids));
+    }
+
+    /**
+     * 清空日志
+     *
+     * @return
+     */
+    @Log(title = "清空日志", action = "/LogController/clean")
+    @ApiOperation(value = "清空日志", notes = "清空日志")
+    @DeleteMapping("/clean")
+    @RequiresPermissions("system:log:remove")
+    @ResponseBody
+    public AjaxResult clean() {
+        sysOperLogService.cleanTSysOperLog();
+        return success();
     }
 }
diff --git a/src/main/java/com/fc/v2/controller/admin/PermissionController.java b/src/main/java/com/fc/v2/controller/admin/SysPermissionController.java
similarity index 78%
rename from src/main/java/com/fc/v2/controller/admin/PermissionController.java
rename to src/main/java/com/fc/v2/controller/admin/SysPermissionController.java
index 475f45cb2007805a3a0797ffb8264afdbf300e3a..a13bae7f076a6d581eb73d730abdacac9fa55087 100644
--- a/src/main/java/com/fc/v2/controller/admin/PermissionController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysPermissionController.java
@@ -5,12 +5,13 @@ import com.fc.v2.common.base.BaseController;
 import com.fc.v2.common.domain.AjaxResult;
 import com.fc.v2.common.domain.ResuTree;
 import com.fc.v2.common.domain.ResultTable;
+import com.fc.v2.common.log.Log;
 import com.fc.v2.model.auto.TSysPermission;
-import com.fc.v2.model.custom.Tablepar;
 import com.fc.v2.shiro.util.ShiroUtils;
 import com.fc.v2.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -29,10 +30,12 @@ import java.util.List;
 @Api(value = "权限")
 @Controller
 @RequestMapping("/PermissionController")
-public class PermissionController extends BaseController {
+public class SysPermissionController extends BaseController {
 
-    //跳转页面参数
-    private final String prefix = "admin/permission";
+    /**
+     * 跳转页面参数
+     */
+    private final String prefix = "admin/sysPermission";
 
     /**
      * 权限列表展示
@@ -52,19 +55,17 @@ public class PermissionController extends BaseController {
     /**
      * 权限列表
      *
-     * @param tablepar
-     * @param searchText 搜索字符
+     * @param tSysPermission
      * @return
      */
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @PostMapping("/list")
     @RequiresPermissions("system:permission:list")
     @ResponseBody
-    public ResultTable list(Tablepar tablepar, String searchText) {
-
+    public ResultTable list(TSysPermission tSysPermission) {
         QueryWrapper<TSysPermission> queryWrapper = new QueryWrapper<TSysPermission>();
         queryWrapper.orderByAsc("order_num");
-        queryWrapper.like(StringUtils.isNotEmpty(searchText), "order_num", searchText);
+        queryWrapper.like(StringUtils.isNotEmpty(tSysPermission.getName()), "name", tSysPermission.getName());
 
         List<TSysPermission> list = sysPermissionService.selectTSysPermissionList(queryWrapper);
         return treeTable(list);
@@ -86,18 +87,13 @@ public class PermissionController extends BaseController {
      * @param tsysPermission
      * @return
      */
-    //@Log(title = "权限添加", action = "1")
+    @Log(title = "权限添加", action = "add")
     @ApiOperation(value = "新增", notes = "新增")
     @PostMapping("/add")
     @RequiresPermissions("system:permission:add")
     @ResponseBody
     public AjaxResult add(@RequestBody TSysPermission tsysPermission) {
-        int b = sysPermissionService.insertTSysPermission(tsysPermission);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysPermissionService.insertTSysPermission(tsysPermission));
     }
 
     /**
@@ -106,22 +102,14 @@ public class PermissionController extends BaseController {
      * @param ids
      * @return
      */
-    //@Log(title = "删除权限", action = "1")
+    @Log(title = "删除权限", action = "remove")
     @ApiOperation(value = "删除", notes = "删除")
     @DeleteMapping("/remove")
     @RequiresPermissions("system:permission:remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        int b = sysPermissionService.deleteTSysPermissionByIds(ids);
-        if (b == 1) {
-            return success();
-        } else if (b == -1) {
-            return error("该权限有子权限，请先删除子权限");
-        } else if (b == -2) {
-            return error("该权限绑定了角色，请解除角色绑定");
-        } else {
-            return error();
-        }
+        ImmutablePair<Integer, String> pair = sysPermissionService.deleteTSysPermissionByIds(ids);
+        return pair.getLeft() < 0 ? error(pair.getRight()) : success();
     }
 
     /**
@@ -134,12 +122,7 @@ public class PermissionController extends BaseController {
     @PostMapping("/checkNameUnique")
     @ResponseBody
     public int checkNameUnique(TSysPermission tSysPermission) {
-        int b = sysPermissionService.checkNameUnique(tSysPermission);
-        if (b > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
+        return sysPermissionService.checkNameUnique(tSysPermission) > 0 ? 1 : 0;
     }
 
     /**
@@ -152,12 +135,7 @@ public class PermissionController extends BaseController {
     @PostMapping("/checkURLUnique")
     @ResponseBody
     public int checkURLUnique(@RequestBody TSysPermission tsysPermission) {
-        int b = sysPermissionService.checkURLUnique(tsysPermission);
-        if (b > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
+        return sysPermissionService.checkURLUnique(tsysPermission) > 0 ? 1 : 0;
     }
 
     /**
@@ -170,12 +148,7 @@ public class PermissionController extends BaseController {
     @PostMapping("/checkPermsUnique")
     @ResponseBody
     public int checkPermsUnique(TSysPermission tsysPermission) {
-        int b = sysPermissionService.checkPermsUnique(tsysPermission);
-        if (b > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
+        return sysPermissionService.checkPermsUnique(tsysPermission) > 0 ? 1 : 0;
     }
 
     /**
@@ -203,7 +176,7 @@ public class PermissionController extends BaseController {
      * @param tSysPermission
      * @return
      */
-    //@Log(title = "修改保存权限", action = "1")
+    @Log(title = "修改保存权限", action = "editSave")
     @ApiOperation(value = "修改保存", notes = "修改保存")
     @RequiresPermissions("system:permission:edit")
     @PostMapping("/edit")
@@ -223,7 +196,6 @@ public class PermissionController extends BaseController {
     @GetMapping("/getCheckPrem")
     @ResponseBody
     public ResuTree getCheckPrem(Long roleId) {
-
         return dataTree(sysPermissionService.getRolePower(roleId));
     }
 
@@ -244,18 +216,18 @@ public class PermissionController extends BaseController {
     /**
      * 修改保存角色
      */
-    //@Log(title = "修改保存角色", action = "1")
+    @Log(title = "修改保存角色", action = "saveRolePower")
     @ApiOperation(value = "授权保存", notes = "授权保存")
     @RequiresPermissions("system:role:edit")
     @PutMapping("/saveRolePower")
     @ResponseBody
     public AjaxResult saveRolePower(Long roleId, String powerIds) {
-        int i = sysRoleService.updateRoleAndPrem(roleId, powerIds);
-        if (i > 0) {
+        int res = sysRoleService.updateRoleAndPrem(roleId, powerIds);
+        if (res > 0) {
             //大于0刷新权限
             ShiroUtils.clearCachedAuthorizationInfo();
         }
-        return toAjax(i);
+        return toAjax(res);
     }
 
 
diff --git a/src/main/java/com/fc/v2/controller/admin/SysPositionController.java b/src/main/java/com/fc/v2/controller/admin/SysPositionController.java
index 4ed14d6a5824676aeb35cf5e6c07216e41764666..dea915583ff69bb01e7227dddded368c459152f2 100644
--- a/src/main/java/com/fc/v2/controller/admin/SysPositionController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysPositionController.java
@@ -1,15 +1,13 @@
 package com.fc.v2.controller.admin;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fc.v2.common.base.BaseController;
 import com.fc.v2.common.domain.AjaxResult;
 import com.fc.v2.common.domain.ResultTable;
+import com.fc.v2.common.log.Log;
 import com.fc.v2.model.auto.TSysPosition;
-import com.fc.v2.model.custom.Tablepar;
 import com.fc.v2.service.ITSysPositionService;
 import com.fc.v2.util.StringUtils;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,12 +17,19 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+/**
+ * 岗位 controller
+ *
+ * @author fuce
+ * @date: 2018年9月30日 下午9:28:31
+ */
 @Controller
 @RequestMapping("/SysPositionController")
 @Api(value = "岗位表")
 public class SysPositionController extends BaseController {
 
     private final String prefix = "admin/sysPosition";
+
     @Autowired
     private ITSysPositionService sysPositionService;
 
@@ -39,28 +44,22 @@ public class SysPositionController extends BaseController {
     }
 
     /**
-     * 分页集合
-     * 
-     * @param tablepar
-     * @param searchText
+     * 岗位查询
+     *
+     * @param tSysPosition
      * @return
      */
-    //@Log(title = "岗位表集合查询", action = "111")
+    @Log(title = "岗位表集合查询", action = "list")
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @PostMapping("/list")
     @RequiresPermissions("gen:sysPosition:list")
     @ResponseBody
-    public ResultTable list(Tablepar tablepar, String searchText) {
+    public ResultTable list(TSysPosition tSysPosition) {
         QueryWrapper<TSysPosition> queryWrapper = new QueryWrapper<TSysPosition>();
-        queryWrapper.orderByAsc("id");
-        queryWrapper.like(StringUtils.isNotEmpty(searchText), "post_name", searchText);
-
-        if(StrUtil.isNotEmpty(tablepar.getOrderByColumn())) {
-            queryWrapper.orderByAsc(tablepar.getOrderByColumn());
-        }
-
-        PageHelper.startPage(tablepar.getPage(), tablepar.getLimit());
+        queryWrapper.like(StringUtils.isNotEmpty(tSysPosition.getPostName()), "post_name", tSysPosition.getPostName());
+        queryWrapper.eq(StringUtils.isNotNull(tSysPosition.getStatus()), "status", tSysPosition.getStatus());
 
+        startPage();
         PageInfo<TSysPosition> page =  new PageInfo<TSysPosition>(sysPositionService.selectTSysPositionList(queryWrapper));
         return pageTable(page.getList(), page.getTotal());
     }
@@ -83,18 +82,16 @@ public class SysPositionController extends BaseController {
      * @param sysPosition
      * @return
      */
-    //@Log(title = "岗位表新增", action = "111")
+    @Log(title = "岗位表新增", action = "add")
     @ApiOperation(value = "新增", notes = "新增")
     @PostMapping("add")
     @RequiresPermissions("gen:sysPosition:add")
     @ResponseBody
     public AjaxResult add(TSysPosition sysPosition) {
-        int b = sysPositionService.insertTSysPosition(sysPosition);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
+        if (sysPositionService.checkNameUnique(sysPosition) > 0){
+            return error("岗位名称重复");
         }
+        return toAjax(sysPositionService.insertTSysPosition(sysPosition));
     }
 
     /**
@@ -103,36 +100,26 @@ public class SysPositionController extends BaseController {
      * @param ids
      * @return
      */
-    //@Log(title = "岗位表删除", action = "111")
+    @Log(title = "岗位表删除", action = "remove")
     @ApiOperation(value = "删除", notes = "删除")
     @DeleteMapping("/remove")
     @RequiresPermissions("gen:sysPosition:remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        int b = sysPositionService.deleteTSysPositionByIds(ids);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysPositionService.deleteTSysPositionByIds(ids));
     }
 
     /**
      * 检查用户
      *
-     * @param TSysUser
+     * @param sysPosition
      * @return
      */
     @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一")
     @PostMapping("/checkNameUnique")
     @ResponseBody
     public int checkNameUnique(TSysPosition sysPosition) {
-        int b = sysPositionService.checkNameUnique(sysPosition);
-        if (b > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
+        return sysPositionService.checkNameUnique(sysPosition) > 0 ? 1 : 0;
     }
 
 
@@ -147,14 +134,13 @@ public class SysPositionController extends BaseController {
     @GetMapping("/edit/{id}")
     public String edit(@PathVariable("id") Long id, ModelMap mmap) {
         mmap.put("SysPosition", sysPositionService.selectTSysPositionById(id));
-
         return prefix + "/edit";
     }
 
     /**
      * 修改保存
      */
-    //@Log(title = "岗位表修改", action = "111")
+    @Log(title = "岗位表修改", action = "editSave")
     @ApiOperation(value = "修改保存", notes = "修改保存")
     @RequiresPermissions("gen:sysPosition:edit")
     @PostMapping("/edit")
@@ -186,9 +172,6 @@ public class SysPositionController extends BaseController {
     @PutMapping("/updateVisible")
     @ResponseBody
     public AjaxResult updateVisible(@RequestBody TSysPosition record) {
-        int i = sysPositionService.updateVisible(record);
-        return toAjax(i);
+        return toAjax(sysPositionService.updateVisible(record));
     }
-
-
 }
diff --git a/src/main/java/com/fc/v2/controller/admin/SysProvinceController.java b/src/main/java/com/fc/v2/controller/admin/SysProvinceController.java
index cef0ddc5156ca6320fa9a58e147d85acae9ce7f5..f651c5217a71db03b99d3f5ec3ad70782081ec66 100644
--- a/src/main/java/com/fc/v2/controller/admin/SysProvinceController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysProvinceController.java
@@ -1,10 +1,11 @@
 package com.fc.v2.controller.admin;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fc.v2.common.domain.ResultTable;
+import com.fc.v2.common.log.Log;
 import com.fc.v2.model.auto.TSysProvince;
 import com.fc.v2.service.ITSysProvinceService;
 import com.fc.v2.util.StringUtils;
-import com.github.pagehelper.PageHelper;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -13,7 +14,6 @@ import org.springframework.web.bind.annotation.*;
 import com.github.pagehelper.PageInfo;
 import com.fc.v2.common.base.BaseController;
 import com.fc.v2.common.domain.AjaxResult;
-import com.fc.v2.model.custom.Tablepar;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -29,7 +29,8 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping("/SysProvinceController")
 public class SysProvinceController extends BaseController {
 
-    private String prefix = "admin/province/sysProvince";
+    private String prefix = "admin/sysProvince/sysProvince";
+
     @Autowired
     private ITSysProvinceService sysProvinceService;
 
@@ -49,27 +50,22 @@ public class SysProvinceController extends BaseController {
     }
 
     /**
-     * list查询
+     * 省份列表
      *
-     * @param tablepar
-     * @param searchText
+     * @param tSysProvince
      * @return
-     * @author fuce
-     * @Date 2019年11月11日 下午4:10:39
      */
-    //@Log(title = "省份表集合查询", action = "111")
+    @Log(title = "省份表集合查询", action = "list")
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/list")
     @RequiresPermissions("gen:sysProvince:list")
     @ResponseBody
-    public Object list(Tablepar tablepar, String searchText) {
-
+    public ResultTable list(TSysProvince tSysProvince) {
         QueryWrapper<TSysProvince> queryWrapper = new QueryWrapper<TSysProvince>();
-        queryWrapper.orderByAsc("id");
-        queryWrapper.like(StringUtils.isNotEmpty(searchText), "province_name", searchText);
-
-        PageHelper.startPage(tablepar.getPage(), tablepar.getLimit());
+        queryWrapper.eq(StringUtils.isNotEmpty(tSysProvince.getProvinceCode()), "province_code", tSysProvince.getProvinceCode());
+        queryWrapper.like(StringUtils.isNotEmpty(tSysProvince.getProvinceName()), "province_name", tSysProvince.getProvinceName());
 
+        startPage();
         PageInfo<TSysProvince> page = new PageInfo<TSysProvince>(sysProvinceService.selectTSysProvinceList(queryWrapper));
         return pageTable(page.getList(), page.getTotal());
     }
@@ -96,18 +92,13 @@ public class SysProvinceController extends BaseController {
      * @author fuce
      * @Date 2019年11月11日 下午4:10:26
      */
-    //@Log(title = "省份表新增", action = "111")
+    @Log(title = "省份表新增", action = "add")
     @ApiOperation(value = "新增", notes = "新增")
     @PostMapping("/add")
     @RequiresPermissions("gen:sysProvince:add")
     @ResponseBody
     public AjaxResult add(TSysProvince sysProvince) {
-        int b = sysProvinceService.insertTSysProvince(sysProvince);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysProvinceService.insertTSysProvince(sysProvince));
     }
 
     /**
@@ -116,18 +107,13 @@ public class SysProvinceController extends BaseController {
      * @param ids
      * @return
      */
-    //@Log(title = "省份表删除", action = "111")
+    @Log(title = "省份表删除", action = "remove")
     @ApiOperation(value = "删除", notes = "删除")
     @DeleteMapping("/remove")
     @RequiresPermissions("gen:sysProvince:remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        int b = sysProvinceService.deleteTSysProvinceByIds(ids);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysProvinceService.deleteTSysProvinceByIds(ids));
     }
 
     /**
@@ -140,12 +126,7 @@ public class SysProvinceController extends BaseController {
     @PostMapping("/checkNameUnique")
     @ResponseBody
     public int checkNameUnique(TSysProvince sysProvince) {
-        int b = sysProvinceService.checkNameUnique(sysProvince);
-        if (b > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
+        return sysProvinceService.checkNameUnique(sysProvince) > 0 ? 1 : 0;
     }
 
 
@@ -160,17 +141,16 @@ public class SysProvinceController extends BaseController {
     @GetMapping("/edit/{id}")
     public String edit(@PathVariable("id") Long id, ModelMap mmap) {
         mmap.put("SysProvince", sysProvinceService.selectTSysProvinceById(id));
-
         return prefix + "/edit";
     }
 
     /**
      * 修改保存
-     * 
+     *
      * @param record
      * @return
      */
-    //@Log(title = "省份表修改", action = "111")
+    @Log(title = "省份表修改", action = "editSave")
     @ApiOperation(value = "修改保存", notes = "修改保存")
     @RequiresPermissions("gen:sysProvince:edit")
     @PostMapping("/edit")
diff --git a/src/main/java/com/fc/v2/controller/admin/QuartzJobController.java b/src/main/java/com/fc/v2/controller/admin/SysQuartzJobController.java
similarity index 78%
rename from src/main/java/com/fc/v2/controller/admin/QuartzJobController.java
rename to src/main/java/com/fc/v2/controller/admin/SysQuartzJobController.java
index c2d8b49e914372e5f0db77ead35e0c31af0239d9..26792a70e48608497758acd06cb68c7f3c1f1a6d 100644
--- a/src/main/java/com/fc/v2/controller/admin/QuartzJobController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysQuartzJobController.java
@@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fc.v2.common.base.BaseController;
 import com.fc.v2.common.domain.AjaxResult;
 import com.fc.v2.common.domain.ResultTable;
+import com.fc.v2.common.log.Log;
 import com.fc.v2.model.auto.TSysQuartzJob;
-import com.fc.v2.model.custom.Tablepar;
 import com.fc.v2.service.ITSysQuartzJobService;
 import com.fc.v2.util.StringUtils;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,9 +26,10 @@ import org.springframework.web.bind.annotation.*;
 @Api(value = "定时任务调度表")
 @Controller
 @RequestMapping("/SysQuartzJobController")
-public class QuartzJobController extends BaseController {
+public class SysQuartzJobController extends BaseController {
 
     private final String prefix = "admin/sysQuartzJob";
+
     @Autowired
     private ITSysQuartzJobService sysQuartzJobService;
 
@@ -51,21 +51,20 @@ public class QuartzJobController extends BaseController {
     /**
      * 定时任务调度list
      *
-     * @param tablepar
-     * @param searchText
+     * @param tSysQuartzJob
      * @return
      */
-    //@Log(title = "定时任务调度表集合查询", action = "111")
+    @Log(title = "定时任务调度表集合查询", action = "list")
     @ApiOperation(value = "定时任务调度list", notes = "定时任务调度list")
     @GetMapping("/list")
     @RequiresPermissions("gen:sysQuartzJob:list")
     @ResponseBody
-    public ResultTable list(Tablepar tablepar, String searchText) {
+    public ResultTable list(TSysQuartzJob tSysQuartzJob) {
         QueryWrapper<TSysQuartzJob> queryWrapper = new QueryWrapper<TSysQuartzJob>();
-        queryWrapper.orderByDesc("id");
-        queryWrapper.like(StringUtils.isNotEmpty(searchText), "job_name", searchText);
+        queryWrapper.like(StringUtils.isNotEmpty(tSysQuartzJob.getJobName()), "job_name", tSysQuartzJob.getJobName());
+        queryWrapper.eq(StringUtils.isNotNull(tSysQuartzJob.getStatus()), "status", tSysQuartzJob.getStatus());
 
-        PageHelper.startPage(tablepar.getPage(), tablepar.getLimit());
+        startPage();
         PageInfo<TSysQuartzJob> page = new PageInfo<TSysQuartzJob>(sysQuartzJobService.selectTSysQuartzJobList(queryWrapper));
         return pageTable(page.getList(), page.getTotal());
     }
@@ -90,18 +89,13 @@ public class QuartzJobController extends BaseController {
      * @author fuce
      * @Date 2019年11月11日 下午4:00:08
      */
-    //@Log(title = "定时任务调度表新增", action = "111")
+    @Log(title = "定时任务调度表新增", action = "add")
     @ApiOperation(value = "新增", notes = "新增")
     @PostMapping("/add")
     @RequiresPermissions("gen:sysQuartzJob:add")
     @ResponseBody
     public AjaxResult add(TSysQuartzJob sysQuartzJob) {
-        int b = sysQuartzJobService.insertTSysQuartzJob(sysQuartzJob);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysQuartzJobService.insertTSysQuartzJob(sysQuartzJob));
     }
 
     /**
@@ -110,36 +104,26 @@ public class QuartzJobController extends BaseController {
      * @param ids
      * @return
      */
-    //@Log(title = "定时任务调度表删除", action = "111")
+    @Log(title = "定时任务调度表删除", action = "/remove")
     @ApiOperation(value = "删除", notes = "删除")
     @DeleteMapping("/remove")
     @RequiresPermissions("gen:sysQuartzJob:remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        int b = sysQuartzJobService.deleteTSysQuartzJobByIds(ids);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysQuartzJobService.deleteTSysQuartzJobByIds(ids));
     }
 
     /**
      * 检查
      *
-     * @param tsysUser
+     * @param sysQuartzJob
      * @return
      */
     @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一")
     @PostMapping("/checkNameUnique")
     @ResponseBody
     public int checkNameUnique(TSysQuartzJob sysQuartzJob) {
-        int b = sysQuartzJobService.checkNameUnique(sysQuartzJob);
-        if (b > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
+        return sysQuartzJobService.checkNameUnique(sysQuartzJob) > 0 ? 1 : 0;
     }
 
 
@@ -154,17 +138,16 @@ public class QuartzJobController extends BaseController {
     @GetMapping("/edit/{id}")
     public String edit(@PathVariable("id") Long id, ModelMap mmap) {
         mmap.put("SysQuartzJob", sysQuartzJobService.selectTSysQuartzJobById(id));
-
         return prefix + "/edit";
     }
 
     /**
      * 修改保存
-     * 
+     *
      * @param record
      * @return
      */
-    //@Log(title = "定时任务调度表修改", action = "111")
+    @Log(title = "定时任务调度表修改", action = "edit")
     @ApiOperation(value = "修改保存", notes = "修改保存")
     @RequiresPermissions("gen:sysQuartzJob:edit")
     @PostMapping("/edit")
@@ -175,12 +158,12 @@ public class QuartzJobController extends BaseController {
 
     /**
      * 任务调度状态修改
-     * 
+     *
      * @param job
      * @return
      * @throws SchedulerException
      */
-    //@Log(title = "任务调度状态修改", action = "1")
+    @Log(title = "任务调度状态修改", action = "changeStatus")
     @ApiOperation(value = "任务调度状态修改", notes = "任务调度状态修改")
     @PutMapping("/changeStatus")
     @ResponseBody
@@ -193,12 +176,12 @@ public class QuartzJobController extends BaseController {
 
     /**
      * 任务调度立即执行一次
-     * 
+     *
      * @param id
      * @return
      * @throws SchedulerException
      */
-    //@Log(title = "任务调度立即执行一次", action = "1")
+    @Log(title = "任务调度立即执行一次", action = "run")
     @ApiOperation(value = "任务调度立即执行一次", notes = "任务调度立即执行一次")
     @GetMapping("/run/{id}")
     @ResponseBody
@@ -207,6 +190,4 @@ public class QuartzJobController extends BaseController {
         sysQuartzJobService.run(newJob);
         return success();
     }
-
-
 }
diff --git a/src/main/java/com/fc/v2/controller/admin/QuartzJobLogController.java b/src/main/java/com/fc/v2/controller/admin/SysQuartzJobLogController.java
similarity index 73%
rename from src/main/java/com/fc/v2/controller/admin/QuartzJobLogController.java
rename to src/main/java/com/fc/v2/controller/admin/SysQuartzJobLogController.java
index c901456530de104ca88ca4142b91312589bd2038..05267e7d96c10547a69c3c27035ada5b75d8644f 100644
--- a/src/main/java/com/fc/v2/controller/admin/QuartzJobLogController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysQuartzJobLogController.java
@@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fc.v2.common.base.BaseController;
 import com.fc.v2.common.domain.AjaxResult;
 import com.fc.v2.common.domain.ResultTable;
+import com.fc.v2.common.log.Log;
 import com.fc.v2.model.auto.TSysQuartzJobLog;
-import com.fc.v2.model.custom.Tablepar;
 import com.fc.v2.service.ITSysQuartzJobLogService;
 import com.fc.v2.util.StringUtils;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -28,9 +27,10 @@ import org.springframework.web.bind.annotation.*;
 @Api(value = "定时任务调度日志表")
 @Controller
 @RequestMapping("/SysQuartzJobLogController")
-public class QuartzJobLogController extends BaseController {
+public class SysQuartzJobLogController extends BaseController {
 
     private final String prefix = "admin/sysQuartzJobLog";
+
     @Autowired
     private ITSysQuartzJobLogService sysQuartzJobLogService;
 
@@ -52,23 +52,20 @@ public class QuartzJobLogController extends BaseController {
     /**
      * 定时任务调度日志list
      *
-     * @param tablepar
-     * @param searchText
+     * @param tSysQuartzJobLog
      * @return
-     * @author fuce
-     * @Date 2019年11月11日 下午4:01:26
      */
-    //@Log(title = "定时任务调度日志表集合查询", action = "111")
+    @Log(title = "定时任务调度日志表集合查询", action = "list")
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/list")
     @RequiresPermissions("gen:sysQuartzJobLog:list")
     @ResponseBody
-    public ResultTable list(Tablepar tablepar, String searchText) {
+    public ResultTable list(TSysQuartzJobLog tSysQuartzJobLog) {
         QueryWrapper<TSysQuartzJobLog> queryWrapper = new QueryWrapper<TSysQuartzJobLog>();
-        queryWrapper.orderByDesc("id");
-        queryWrapper.like(StringUtils.isNotEmpty(searchText), "job_name", searchText);
+        queryWrapper.like(StringUtils.isNotEmpty(tSysQuartzJobLog.getJobName()), "job_name", tSysQuartzJobLog.getJobName());
+        queryWrapper.eq(StringUtils.isNotNull(tSysQuartzJobLog.getStatus()), "status", tSysQuartzJobLog.getStatus());
 
-        PageHelper.startPage(tablepar.getPage(), tablepar.getLimit());
+        startPage();
         PageInfo<TSysQuartzJobLog> page = new PageInfo<TSysQuartzJobLog>(sysQuartzJobLogService.selectTSysQuartzJobLogList(queryWrapper));
         return pageTable(page.getList(), page.getTotal());
     }
@@ -98,19 +95,27 @@ public class QuartzJobLogController extends BaseController {
      * @author fuce
      * @Date 2019年11月20日 下午10:51:52
      */
-    //@Log(title = "定时任务调度日志表删除", action = "111")
+    @Log(title = "定时任务调度日志表删除", action = "remove")
     @ApiOperation(value = "定时任务日志删除", notes = "定时任务日志删除")
     @DeleteMapping("/remove")
     @RequiresPermissions("gen:sysQuartzJobLog:remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        int b = sysQuartzJobLogService.deleteTSysQuartzJobLogByIds(ids);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysQuartzJobLogService.deleteTSysQuartzJobLogByIds(ids));
     }
 
-
+    /**
+     * 清空日志
+     *
+     * @return
+     */
+    @Log(title = "清空日志", action = "clean")
+    @ApiOperation(value = "清空日志", notes = "清空日志")
+    @DeleteMapping("/clean")
+    @RequiresPermissions("gen:sysQuartzJobLog:remove")
+    @ResponseBody
+    public AjaxResult clean() {
+        sysQuartzJobLogService.cleanQuartzJobLog();
+        return success();
+    }
 }
diff --git a/src/main/java/com/fc/v2/controller/admin/RoleController.java b/src/main/java/com/fc/v2/controller/admin/SysRoleController.java
similarity index 68%
rename from src/main/java/com/fc/v2/controller/admin/RoleController.java
rename to src/main/java/com/fc/v2/controller/admin/SysRoleController.java
index afa41887e07a6afb15c9b626236e611c4b1fe46a..7eb6feb18638b611b35e715cd5ff5475a76bbe36 100644
--- a/src/main/java/com/fc/v2/controller/admin/RoleController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysRoleController.java
@@ -4,10 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fc.v2.common.base.BaseController;
 import com.fc.v2.common.domain.AjaxResult;
 import com.fc.v2.common.domain.ResultTable;
+import com.fc.v2.common.log.Log;
 import com.fc.v2.model.auto.TSysRole;
-import com.fc.v2.model.custom.Tablepar;
 import com.fc.v2.util.StringUtils;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,10 +24,12 @@ import org.springframework.web.bind.annotation.*;
 @Api(value = "用户角色")
 @Controller
 @RequestMapping("/RoleController")
-public class RoleController extends BaseController {
+public class SysRoleController extends BaseController {
 
-	// 跳转页面参数
-	private final String prefix = "admin/role";
+	/**
+	 * 跳转页面参数
+	 */
+	private final String prefix = "admin/sysRole";
 
 	/**
 	 * 展示页面
@@ -48,20 +49,18 @@ public class RoleController extends BaseController {
 	/**
 	 * 角色列表
 	 *
-	 * @param tablepar
-	 * @param searchText 搜索字符
+	 * @param tSysRole
 	 * @return
 	 */
 	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping("/list")
 	@RequiresPermissions("system:role:list")
 	@ResponseBody
-	public ResultTable list(Tablepar tablepar) {
+	public ResultTable list(TSysRole tSysRole) {
 		QueryWrapper<TSysRole> queryWrapper = new QueryWrapper<TSysRole>();
-		queryWrapper.orderByDesc("ID");
-		queryWrapper.like(StringUtils.isNotEmpty(tablepar.getSearchText()), "name", tablepar.getSearchText());
+		queryWrapper.like(StringUtils.isNotEmpty(tSysRole.getName()), "name", tSysRole.getName());
 
-		PageHelper.startPage(tablepar.getPage(), tablepar.getLimit());
+		startPage();
 		PageInfo<TSysRole> page = new PageInfo<TSysRole>(sysRoleService.selectTSysRoleList(queryWrapper));
 		return treeTable(page.getList());
 	}
@@ -83,18 +82,16 @@ public class RoleController extends BaseController {
 	 * @param role
 	 * @return
 	 */
-	// @Log(title = "角色添加", action = "1")
+	@Log(title = "角色添加", action = "add")
 	@ApiOperation(value = "新增", notes = "新增")
 	@PostMapping("/add")
 	@RequiresPermissions("system:role:add")
 	@ResponseBody
 	public AjaxResult add(@RequestBody TSysRole role) {
-		int b = sysRoleService.insertTSysRole(role);
-		if (b > 0) {
-			return success();
-		} else {
-			return error();
+		if (sysRoleService.checkNameUnique(role) > 0){
+			return error("角色名重复");
 		}
+		return toAjax(sysRoleService.insertTSysRole(role));
 	}
 
 	/**
@@ -103,36 +100,13 @@ public class RoleController extends BaseController {
 	 * @param ids
 	 * @return
 	 */
-	// @Log(title = "删除角色", action = "1")
+	@Log(title = "删除角色", action = "remove")
 	@ApiOperation(value = "删除", notes = "删除")
 	@DeleteMapping("/remove")
 	@RequiresPermissions("system:role:remove")
 	@ResponseBody
 	public AjaxResult remove(String ids) {
-		int b = sysRoleService.deleteTSysRoleByIds(ids);
-		if (b > 0) {
-			return success();
-		} else {
-			return error();
-		}
-	}
-
-	/**
-	 * 检查角色
-	 *
-	 * @param tsysRole
-	 * @return
-	 */
-	@ApiOperation(value = "检查Name唯一", notes = "检查Name唯一")
-	@PostMapping("/checkNameUnique")
-	@ResponseBody
-	public int checkNameUnique(TSysRole tsysRole) {
-		int b = sysRoleService.checkNameUnique(tsysRole);
-		if (b > 0) {
-			return 1;
-		} else {
-			return 0;
-		}
+		return toAjax(sysRoleService.deleteTSysRoleByIds(ids));
 	}
 
 	/**
@@ -155,13 +129,12 @@ public class RoleController extends BaseController {
 	 * @param tsysRole
 	 * @return
 	 */
-	// @Log(title = "修改保存角色", action = "1")
+	@Log(title = "修改保存角色", action = "editSave")
 	@ApiOperation(value = "修改保存", notes = "修改保存")
 	@RequiresPermissions("system:role:edit")
 	@PutMapping("/edit")
 	@ResponseBody
 	public AjaxResult editSave(@RequestBody TSysRole tsysRole) {
-		int i = sysRoleService.updateTSysRole(tsysRole);
-		return toAjax(i);
+		return toAjax(sysRoleService.updateTSysRole(tsysRole));
 	}
 }
diff --git a/src/main/java/com/fc/v2/controller/admin/SysStreetController.java b/src/main/java/com/fc/v2/controller/admin/SysStreetController.java
index 021e1c23a9868bb864a8282f09fb3e548ae25611..401ba9310b4f0d2d18d97ed0c9070e8addcf27bd 100644
--- a/src/main/java/com/fc/v2/controller/admin/SysStreetController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysStreetController.java
@@ -3,12 +3,13 @@ package com.fc.v2.controller.admin;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fc.v2.common.domain.ResultTable;
+import com.fc.v2.common.log.Log;
 import com.fc.v2.model.auto.TSysArea;
 import com.fc.v2.model.auto.TSysStreet;
 import com.fc.v2.service.ITSysAreaService;
 import com.fc.v2.service.ITSysStreetService;
 import com.fc.v2.util.StringUtils;
-import com.github.pagehelper.PageHelper;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -17,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 import com.github.pagehelper.PageInfo;
 import com.fc.v2.common.base.BaseController;
 import com.fc.v2.common.domain.AjaxResult;
-import com.fc.v2.model.custom.Tablepar;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -33,9 +33,11 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping("/SysStreetController")
 public class SysStreetController extends BaseController {
 
-    private String prefix = "admin/province/sysStreet";
+    private String prefix = "admin/sysProvince/sysStreet";
+
     @Autowired
     private ITSysStreetService sysStreetService;
+
     @Autowired
     private ITSysAreaService sysAreaService;
 
@@ -53,25 +55,22 @@ public class SysStreetController extends BaseController {
     }
 
     /**
-     * list查询
+     * 街道查询
      *
-     * @param tablepar
-     * @param searchText
+     * @param tSysStreet
      * @return
      */
-    //@Log(title = "街道设置集合查询", action = "111")
+    @Log(title = "街道设置集合查询", action = "list")
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/list")
     @RequiresPermissions("gen:sysStreet:list")
     @ResponseBody
-    public Object list(Tablepar tablepar, String searchText) {
-
+    public ResultTable list(TSysStreet tSysStreet) {
         QueryWrapper<TSysStreet> queryWrapper = new QueryWrapper<TSysStreet>();
-        queryWrapper.orderByAsc("id");
-        queryWrapper.like(StringUtils.isNotEmpty(searchText), "street_name", searchText);
-
-        PageHelper.startPage(tablepar.getPage(), tablepar.getLimit());
+        queryWrapper.eq(StringUtils.isNotEmpty(tSysStreet.getStreetCode()), "street_code", tSysStreet.getStreetCode());
+        queryWrapper.like(StringUtils.isNotEmpty(tSysStreet.getStreetName()), "street_name", tSysStreet.getStreetName());
 
+        startPage();
         PageInfo<TSysStreet> page = new PageInfo<TSysStreet>(sysStreetService.selectTSysStreetList(queryWrapper));
         return pageTable(page.getList(), page.getTotal());
     }
@@ -98,18 +97,13 @@ public class SysStreetController extends BaseController {
      * @author fuce
      * @Date 2019年11月11日 下午4:13:37
      */
-    //@Log(title = "街道设置新增", action = "111")
+    @Log(title = "街道设置新增", action = "add")
     @ApiOperation(value = "新增", notes = "新增")
     @PostMapping("/add")
     @RequiresPermissions("gen:sysStreet:add")
     @ResponseBody
     public AjaxResult add(TSysStreet sysStreet) {
-        int b = sysStreetService.insertTSysStreet(sysStreet);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysStreetService.insertTSysStreet(sysStreet));
     }
 
     /**
@@ -118,18 +112,13 @@ public class SysStreetController extends BaseController {
      * @param ids
      * @return
      */
-    //@Log(title = "街道设置删除", action = "111")
+    @Log(title = "街道设置删除", action = "remove")
     @ApiOperation(value = "删除", notes = "删除")
     @DeleteMapping("/remove")
     @RequiresPermissions("gen:sysStreet:remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        int b = sysStreetService.deleteTSysStreetByIds(ids);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysStreetService.deleteTSysStreetByIds(ids));
     }
 
     /**
@@ -142,12 +131,7 @@ public class SysStreetController extends BaseController {
     @PostMapping("/checkNameUnique")
     @ResponseBody
     public int checkNameUnique(TSysStreet sysStreet) {
-        int b = sysStreetService.checkNameUnique(sysStreet);
-        if (b > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
+        return sysStreetService.checkNameUnique(sysStreet) > 0 ? 1 : 0;
     }
 
 
@@ -173,7 +157,7 @@ public class SysStreetController extends BaseController {
      * @param record
      * @return
      */
-    //@Log(title = "街道设置修改", action = "111")
+    @Log(title = "街道设置修改", action = "editSave")
     @ApiOperation(value = "修改保存", notes = "修改保存")
     @RequiresPermissions("gen:sysStreet:edit")
     @PostMapping("/edit")
@@ -181,6 +165,4 @@ public class SysStreetController extends BaseController {
     public AjaxResult editSave(TSysStreet record) {
         return toAjax(sysStreetService.updateTSysStreet(record));
     }
-
-
 }
diff --git a/src/main/java/com/fc/v2/controller/admin/UserController.java b/src/main/java/com/fc/v2/controller/admin/SysUserController.java
similarity index 78%
rename from src/main/java/com/fc/v2/controller/admin/UserController.java
rename to src/main/java/com/fc/v2/controller/admin/SysUserController.java
index f49b498d897bc83e805915cf38c93aa75157dff6..221a0772b9cd8f492fe7bc6a4cbaa062ea4bcbb8 100644
--- a/src/main/java/com/fc/v2/controller/admin/UserController.java
+++ b/src/main/java/com/fc/v2/controller/admin/SysUserController.java
@@ -19,7 +19,6 @@ import com.fc.v2.common.base.BaseController;
 import com.fc.v2.common.domain.AjaxResult;
 import com.fc.v2.common.log.Log;
 import com.fc.v2.model.custom.RoleVo;
-import com.fc.v2.model.custom.Tablepar;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,13 +33,19 @@ import io.swagger.annotations.ApiOperation;
 @Api(value = "用户数据")
 @Controller
 @RequestMapping("/UserController")
-public class UserController extends BaseController {
+public class SysUserController extends BaseController {
 
-    private final String prefix = "admin/user";
-    //部门
+    private final String prefix = "admin/sysUser";
+
+    /**
+     * 部门
+     */
     @Autowired
     private ITSysDepartmentService departmentService;
-    //岗位
+
+    /**
+     * 岗位
+     */
     @Autowired
     private ITSysPositionService positionService;
 
@@ -59,23 +64,20 @@ public class UserController extends BaseController {
         return prefix + "/list";
     }
 
-
     /**
-     * list集合
+     * 用户列表
      *
-     * @param tablepar
-     * @param searchText
+     * @param tSysUser
      * @return
-     * @author fuce
-     * @Date 2019年11月11日 下午4:14:40
      */
-    //@Log(title = "分页查询", action = "1")
+    @Log(title = "分页查询", action = "1")
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/list")
     @RequiresPermissions("system:user:list")
     @ResponseBody
-    public ResultTable list(Tablepar tablepar) {
-        PageInfo<TSysUser> page = sysUserService.userList(tablepar);
+    public ResultTable list(TSysUser tSysUser) {
+        startPage();
+        PageInfo<TSysUser> page = new PageInfo<TSysUser>(sysUserService.selectTSysUserList(tSysUser));
         return pageTable(page.getList(), page.getTotal());
     }
 
@@ -109,24 +111,21 @@ public class UserController extends BaseController {
      * 新增保存
      *
      * @param user
-     * @param model
-     * @param roles
+     * @param roleIds
      * @return
      * @author fuce
      * @Date 2019年11月11日 下午4:14:57
      */
-    @Log(title = "用户新增", action = "111")
+    @Log(title = "用户新增", action = "add")
     @ApiOperation(value = "新增", notes = "新增")
     @PostMapping("/add")
     @RequiresPermissions("system:user:add")
     @ResponseBody
     public AjaxResult add(TSysUser user, @RequestParam(value = "roleIds", required = false) String roleIds) {
-        int b = sysUserService.insertUserRoles(user, roleIds);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
+        if (sysUserService.checkLoginNameUnique(user) > 0){
+            return error("登陆用户名重复");
         }
+        return toAjax(sysUserService.insertUserRoles(user, roleIds));
     }
 
     /**
@@ -135,39 +134,15 @@ public class UserController extends BaseController {
      * @param ids
      * @return
      */
-    //@Log(title = "删除用户", action = "1")
+    @Log(title = "删除用户", action = "remove")
     @ApiOperation(value = "删除", notes = "删除")
     @DeleteMapping("/remove")
     @RequiresPermissions("system:user:remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        int b = sysUserService.deleteTSysUserByIds(ids);
-        if (b > 0) {
-            return success();
-        } else {
-            return error();
-        }
+        return toAjax(sysUserService.deleteTSysUserByIds(ids));
     }
 
-    /**
-     * 检查用户
-     *
-     * @param tsysUser
-     * @return
-     */
-    @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一")
-    @PostMapping("/checkLoginNameUnique")
-    @ResponseBody
-    public int checkLoginNameUnique(TSysUser tsysUser) {
-        int b = sysUserService.checkLoginNameUnique(tsysUser);
-        if (b > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
-    }
-
-
     /**
      * 修改用户跳转
      *
@@ -196,7 +171,7 @@ public class UserController extends BaseController {
      * @param roleIds
      * @return
      */
-    //@Log(title = "修改保存用户", action = "1")
+    @Log(title = "修改保存用户", action = "editSave")
     @ApiOperation(value = "修改保存用户", notes = "修改保存用户")
     @RequiresPermissions("system:user:edit")
     @PostMapping("/edit")
@@ -213,7 +188,7 @@ public class UserController extends BaseController {
      * @param mmap
      * @return
      */
-    //@Log(title = "修改用户密码", action = "1")
+    @Log(title = "修改用户密码", action = "editPwd")
     @ApiOperation(value = "修改用户密码跳转", notes = "修改用户密码跳转")
     @GetMapping("/editPwd/{id}")
     public String editPwd(@PathVariable("id") Long id, ModelMap mmap) {
@@ -227,7 +202,7 @@ public class UserController extends BaseController {
      * @param tsysUser
      * @return
      */
-    //@Log(title = "修改用户密码", action = "1")
+    @Log(title = "修改用户密码", action = "editPwdSave")
     @ApiOperation(value = "修改用户密码", notes = "修改用户密码")
     @RequiresPermissions("system:user:editPwd")
     @PostMapping("/editPwd")
diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysOperLogMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysOperLogMapper.java
index f2fd7ff02827163b5ca2a6260d953b735dd366c3..6579a909c27cff25545bdab8f4d2a25c9dfb82ba 100644
--- a/src/main/java/com/fc/v2/mapper/auto/TSysOperLogMapper.java
+++ b/src/main/java/com/fc/v2/mapper/auto/TSysOperLogMapper.java
@@ -13,4 +13,10 @@ import com.fc.v2.model.auto.TSysOperLog;
  */
 public interface TSysOperLogMapper extends BaseMapper<TSysOperLog> {
 
+    /**
+     * 清空日志
+     *
+     * @return
+     */
+    public void cleanTSysOperLog();
 }
diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysQuartzJobLogMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysQuartzJobLogMapper.java
index bf890e20c58bb4d6ad2bbf047cb93837103ccf61..c8b06323daef826c09ed0e94ccfc255d1f3e5c40 100644
--- a/src/main/java/com/fc/v2/mapper/auto/TSysQuartzJobLogMapper.java
+++ b/src/main/java/com/fc/v2/mapper/auto/TSysQuartzJobLogMapper.java
@@ -1,7 +1,6 @@
 
 package com.fc.v2.mapper.auto;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fc.v2.model.auto.TSysQuartzJobLog;
 
@@ -13,4 +12,8 @@ import com.fc.v2.model.auto.TSysQuartzJobLog;
  */
 public interface TSysQuartzJobLogMapper extends BaseMapper<TSysQuartzJobLog> {
 
+    /**
+     * 清空定时任务调度日志信息
+     */
+    public void cleanQuartzJobLog();
 }
diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysUserMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysUserMapper.java
index 11a6b88486f15535fb59d8e913c36e0ab16aaca5..e6847ffad0af3d458172ccd334d815158a57863f 100644
--- a/src/main/java/com/fc/v2/mapper/auto/TSysUserMapper.java
+++ b/src/main/java/com/fc/v2/mapper/auto/TSysUserMapper.java
@@ -23,22 +23,10 @@ public interface TSysUserMapper extends BaseMapper<TSysUser> {
 	public TSysUser queryUserName(String username);
 
 	/**
-	 * 查询用户详情 String name 如果没用 注解@Param("") 它到mapper里面为_parameter
+	 * 查询用户列表
 	 *
+	 * @param tSysUser
 	 * @return
-	 * @author fuce
-	 * @Date 2020年12月6日 下午9:02:20
 	 */
-	@Select({"<script>",
-			" select id, username, password, nickname," +
-			" (select dept_name from t_sys_department dep where dep.id=tsu.dep_id)as dep_name," +
-			" (select post_name from t_sys_position pos where pos.id=tsu.pos_id)as pos_name," +
-			" dep_id, pos_id" +
-			" from t_sys_user tsu" +
-			" <if test=\"_parameter != null and _parameter!=''\" >" +
-			"     where  username like concat('%', #{_parameter}, '%')" +
-			" </if>" +
-			" order by id+0 DESC" +
-					"</script>"})
-	public List<TSysUser> queryUserInfo(String username);
+	public List<TSysUser> selectTSysUserList(TSysUser tSysUser);
 }
\ No newline at end of file
diff --git a/src/main/java/com/fc/v2/model/custom/Tablepar.java b/src/main/java/com/fc/v2/model/custom/Tablepar.java
index 983390b80b32ffd810010a0027401634a627e2b7..e7a3a7acd2e550431c559b73c80c714ff060f6df 100644
--- a/src/main/java/com/fc/v2/model/custom/Tablepar.java
+++ b/src/main/java/com/fc/v2/model/custom/Tablepar.java
@@ -1,50 +1,101 @@
 package com.fc.v2.model.custom;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fc.v2.util.ServletUtils;
+import com.fc.v2.util.StringUtils;
+import sun.security.pkcs11.wrapper.Constants;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.spi.http.HttpContext;
+
 /**
  * boostrap table post 参数
- * @author fc
  *
+ * @author fc
  */
 public class Tablepar {
-	private int page;//页码
-	private int limit;//数量
-	private String orderByColumn;//排序字段
-	private String isAsc;//排序字符 asc desc 
-	private String searchText;//列表table里面的搜索
-
-	public int getPage() {
-		return page;
-	}
-
-	public void setPage(int page) {
-		this.page = page;
-	}
-
-	public int getLimit() {
-		return limit;
-	}
-
-	public void setLimit(int limit) {
-		this.limit = limit;
-	}
-
-	public String getOrderByColumn() {
-		return orderByColumn;
-	}
-	public void setOrderByColumn(String orderByColumn) {
-		this.orderByColumn = orderByColumn;
-	}
-	public String getIsAsc() {
-		return isAsc;
-	}
-	public void setIsAsc(String isAsc) {
-		this.isAsc = isAsc;
-	}
-	public String getSearchText() {
-		return searchText;
-	}
-	public void setSearchText(String searchText) {
-		this.searchText = searchText;
-	}
+
+    /**
+     * 页码
+     */
+    private int page;
+
+    /**
+     * 数量
+     */
+    private int limit;
+
+    /**
+     * 排序字段
+     */
+    private String orderByColumn;
+
+    /**
+     * 排序字符 asc desc
+     */
+    private String isAsc;
+
+    /**
+     * 列表table里面的搜索
+     */
+    private String searchText;
+
+    /**
+     * 获取layui table的分页参数
+     *
+     * @return
+     */
+    public static Tablepar buildPageRequest() {
+        Tablepar tablepar = new Tablepar();
+        //第几页
+        tablepar.setPage(ServletUtils.getParameterToInt("page", 0));
+        tablepar.setLimit(ServletUtils.getParameterToInt("limit", 0));
+        tablepar.setOrderByColumn(ServletUtils.getParameter("orderByColumn"));
+        tablepar.setIsAsc(ServletUtils.getParameter("isAsc"));
+        return tablepar;
+    }
+
+    public int getPage() {
+        return page;
+    }
+
+    public void setPage(int page) {
+        this.page = page;
+    }
+
+    public int getLimit() {
+        return limit;
+    }
+
+    public void setLimit(int limit) {
+        this.limit = limit;
+    }
+
+    public String getOrderByColumn() {
+        if (StringUtils.isEmpty(orderByColumn)) {
+            return "";
+        }
+        return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc;
+    }
+
+    public void setOrderByColumn(String orderByColumn) {
+        this.orderByColumn = orderByColumn;
+    }
+
+    public String getIsAsc() {
+        return isAsc;
+    }
+
+    public void setIsAsc(String isAsc) {
+        this.isAsc = isAsc;
+    }
+
+    public String getSearchText() {
+        return searchText;
+    }
+
+    public void setSearchText(String searchText) {
+        this.searchText = searchText;
+    }
 
 }
diff --git a/src/main/java/com/fc/v2/service/ITSysDictDataService.java b/src/main/java/com/fc/v2/service/ITSysDictDataService.java
index 79f90d2f4a335061ae1df822c4e5eb6498741444..bb25f3f21c507e714b45b77cdc1084006acee2ad 100644
--- a/src/main/java/com/fc/v2/service/ITSysDictDataService.java
+++ b/src/main/java/com/fc/v2/service/ITSysDictDataService.java
@@ -70,6 +70,14 @@ public interface ITSysDictDataService extends IService<TSysDictData> {
 	 */
 	public int deleteTSysDictDataById(Long id);
 
+	/**
+	 * 删除字典数据信息
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	public int deleteTSysDictData(Wrapper<TSysDictData> queryWrapper);
+
 	/**
 	 * 检查name
 	 *
diff --git a/src/main/java/com/fc/v2/service/ITSysOperLogService.java b/src/main/java/com/fc/v2/service/ITSysOperLogService.java
index f71626897b894420cde4468f53de3cd51b78e7e0..d55fbb18b0f430a111dfb64a8dc0d792c13bb5c1 100644
--- a/src/main/java/com/fc/v2/service/ITSysOperLogService.java
+++ b/src/main/java/com/fc/v2/service/ITSysOperLogService.java
@@ -77,4 +77,11 @@ public interface ITSysOperLogService extends IService<TSysOperLog> {
 	 * @return
 	 */
 	public List<TSysOperLog> getNEW();
+
+	/**
+	 * 清空日志
+	 *
+	 * @return
+	 */
+	public void cleanTSysOperLog();
 }
diff --git a/src/main/java/com/fc/v2/service/ITSysPermissionRoleService.java b/src/main/java/com/fc/v2/service/ITSysPermissionRoleService.java
index baebff07fa82980b6551b6f98d087a8b6a2432f9..d3ccc510b1aa62fbd0a4f93e54677fc593bb149f 100644
--- a/src/main/java/com/fc/v2/service/ITSysPermissionRoleService.java
+++ b/src/main/java/com/fc/v2/service/ITSysPermissionRoleService.java
@@ -4,9 +4,11 @@ package com.fc.v2.service;
 import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import com.fc.v2.model.auto.TSysPermissionRole;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 角色权限中间Service接口
@@ -31,6 +33,14 @@ public interface ITSysPermissionRoleService extends IService<TSysPermissionRole>
 	 */
 	public List<TSysPermissionRole> selectTSysPermissionRoleList(Wrapper<TSysPermissionRole> queryWrapper);
 
+	/**
+	 * 根据 Wrapper 条件，查询总记录数
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	Integer selectCount(@Param(Constants.WRAPPER) Wrapper<TSysPermissionRole> queryWrapper);
+
 	/**
 	 * 查询角色权限中间列表
 	 *
diff --git a/src/main/java/com/fc/v2/service/ITSysPermissionService.java b/src/main/java/com/fc/v2/service/ITSysPermissionService.java
index 4a1a3281987ad6a5e748456e6f87287f6c1850ea..828a33ff10c30a87f38c7962cdea5bac5ea632dc 100644
--- a/src/main/java/com/fc/v2/service/ITSysPermissionService.java
+++ b/src/main/java/com/fc/v2/service/ITSysPermissionService.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fc.v2.model.auto.TSysPermission;
 import com.fc.v2.model.custom.SysMenu;
 import com.fc.v2.model.custom.SysPower;
+import org.apache.commons.lang3.tuple.ImmutablePair;
 
 /**
  * 权限Service接口
@@ -70,7 +71,7 @@ public interface ITSysPermissionService extends IService<TSysPermission> {
 	 * @param ids 需要删除的数据ID
 	 * @return 结果
 	 */
-	public int deleteTSysPermissionByIds(String ids);
+	public ImmutablePair<Integer, String> deleteTSysPermissionByIds(String ids);
 
 	/**
 	 * 删除权限信息
diff --git a/src/main/java/com/fc/v2/service/ITSysQuartzJobLogService.java b/src/main/java/com/fc/v2/service/ITSysQuartzJobLogService.java
index c242b36cf7274f452a0acbd969ccec914e5e951d..57d45e7d4b2527f0a730cb177b0f9b829b1ef79c 100644
--- a/src/main/java/com/fc/v2/service/ITSysQuartzJobLogService.java
+++ b/src/main/java/com/fc/v2/service/ITSysQuartzJobLogService.java
@@ -69,4 +69,9 @@ public interface ITSysQuartzJobLogService extends IService<TSysQuartzJobLog> {
 	 * @return 结果
 	 */
 	public int deleteTSysQuartzJobLogById(Long id);
+
+	/**
+	 * 清空定时任务调度日志信息
+	 */
+	public void cleanQuartzJobLog();
 }
diff --git a/src/main/java/com/fc/v2/service/ITSysUserService.java b/src/main/java/com/fc/v2/service/ITSysUserService.java
index f09af99c696624246c0f4c3238bbb7771d461da8..b7ecc32e6630b00af50a124be21014b9351230e7 100644
--- a/src/main/java/com/fc/v2/service/ITSysUserService.java
+++ b/src/main/java/com/fc/v2/service/ITSysUserService.java
@@ -74,7 +74,7 @@ public interface ITSysUserService extends IService<TSysUser> {
 	public int deleteTSysUserById(Long id);
 
 	/**
-	 * 检查用户name
+	 * 新增用户
 	 *
 	 * @param user
 	 * @param roleIds
@@ -83,6 +83,7 @@ public interface ITSysUserService extends IService<TSysUser> {
 	int insertUserRoles(TSysUser user, String roleIds);
 
 	/**
+	 * 检查LogingName
 	 *
 	 * @param tsysUser
 	 * @return
@@ -115,13 +116,7 @@ public interface ITSysUserService extends IService<TSysUser> {
 	int updateUserPassword(TSysUser tsysUser);
 
 	/**
-	 *
-	 * @param tablepar
-	 * @return
-	 */
-	PageInfo<TSysUser> userList(Tablepar tablepar);
-
-	/**
+	 * 根据用户名称查询
 	 *
 	 * @param username
 	 * @return
diff --git a/src/main/java/com/fc/v2/service/impl/TSysDepartmentServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysDepartmentServiceImpl.java
index df3a2d44d9a0d47f82be7b8bd0f7a449441dc157..e6c35aee415bb4f7dcaa8ce6e4137dbb7b7dd87c 100644
--- a/src/main/java/com/fc/v2/service/impl/TSysDepartmentServiceImpl.java
+++ b/src/main/java/com/fc/v2/service/impl/TSysDepartmentServiceImpl.java
@@ -57,6 +57,12 @@ public class TSysDepartmentServiceImpl  extends ServiceImpl<TSysDepartmentMapper
         return this.baseMapper.selectList(queryWrapper);
     }
 
+    /**
+     * 查询部门列表
+     *
+     * @param tSysDepartment 部门
+     * @return 部门
+     */
     @Override
     public List<TSysDepartment> selectTSysDepartmentList(TSysDepartment tSysDepartment) {
     	Map<String, Object>  map = BeanUtil.beanToMap(tSysDepartment, true, true);
diff --git a/src/main/java/com/fc/v2/service/impl/TSysDictDataServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysDictDataServiceImpl.java
index 8bb152d2bf7c680a50fd4962aa01270a1f5799dc..b49c48610be368699b543fa0c85b672f6d64bcc2 100644
--- a/src/main/java/com/fc/v2/service/impl/TSysDictDataServiceImpl.java
+++ b/src/main/java/com/fc/v2/service/impl/TSysDictDataServiceImpl.java
@@ -119,6 +119,17 @@ public class TSysDictDataServiceImpl  extends ServiceImpl<TSysDictDataMapper, TS
         return this.baseMapper.deleteById(id);
     }
 
+    /**
+     * 删除字典数据信息
+     *
+     * @param queryWrapper
+     * @return
+     */
+    @Override
+    public int deleteTSysDictData(Wrapper<TSysDictData> queryWrapper) {
+        return this.baseMapper.delete(queryWrapper);
+    }
+
     /**
      * 检查name
      *
diff --git a/src/main/java/com/fc/v2/service/impl/TSysDictTypeServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysDictTypeServiceImpl.java
index 7acdca35f8baeb101a6ed22546fbdbd782a47bdc..99aa600d63c8878b28787c4e977b41460a84b0d6 100644
--- a/src/main/java/com/fc/v2/service/impl/TSysDictTypeServiceImpl.java
+++ b/src/main/java/com/fc/v2/service/impl/TSysDictTypeServiceImpl.java
@@ -1,6 +1,7 @@
 
 package com.fc.v2.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Arrays;
@@ -8,6 +9,8 @@ import java.util.Arrays;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fc.v2.model.auto.TSysDictData;
+import com.fc.v2.service.ITSysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.fc.v2.mapper.auto.TSysDictTypeMapper;
@@ -33,6 +36,9 @@ public class TSysDictTypeServiceImpl  extends ServiceImpl<TSysDictTypeMapper, TS
     @Autowired
     private TSysDictTypeMapper tSysDictTypeMapper;
 
+    @Autowired
+    private ITSysDictDataService dataService;
+
     /**
      * 查询字典类型
      * 
@@ -104,7 +110,17 @@ public class TSysDictTypeServiceImpl  extends ServiceImpl<TSysDictTypeMapper, TS
     @Override
     public int deleteTSysDictTypeByIds(String ids)
     {
-        return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids)));
+        //获取字典类型
+        List<TSysDictType> tSysDictTypes = this.baseMapper.selectBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids)));
+        List<String> dictTypes = new ArrayList<String>();
+        tSysDictTypes.forEach(tSysDictType -> dictTypes.add(tSysDictType.getDictType()));
+        QueryWrapper<TSysDictData> queryWrapper = new QueryWrapper<TSysDictData>();
+        queryWrapper.in("dict_type", dictTypes);
+        //删除字典类型
+        if (dataService.deleteTSysDictData(queryWrapper) > 0){
+            return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids)));
+        }
+        return 0;
     }
 
     /**
diff --git a/src/main/java/com/fc/v2/service/impl/TSysOperLogServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysOperLogServiceImpl.java
index 477607972869fe9eb2fa40ab379b097ddf36757c..ba9fee4514df1974f5e245d57d6219f1b4ee1ab5 100644
--- a/src/main/java/com/fc/v2/service/impl/TSysOperLogServiceImpl.java
+++ b/src/main/java/com/fc/v2/service/impl/TSysOperLogServiceImpl.java
@@ -132,4 +132,14 @@ public class TSysOperLogServiceImpl  extends ServiceImpl<TSysOperLogMapper, TSys
         PageHelper.startPage(1, 10);
         return this.selectTSysOperLogList(queryWrapper);
     }
+
+    /**
+     * 清空日志
+     *
+     * @return
+     */
+    @Override
+    public void cleanTSysOperLog() {
+        tSysOperLogMapper.cleanTSysOperLog();
+    }
 }
diff --git a/src/main/java/com/fc/v2/service/impl/TSysPermissionRoleServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysPermissionRoleServiceImpl.java
index 8b2da9c3d732cb615f075a9cb4df293df942bf79..883e8a08589b88dbd9dcc94dc2a63b5a2cd4ca2b 100644
--- a/src/main/java/com/fc/v2/service/impl/TSysPermissionRoleServiceImpl.java
+++ b/src/main/java/com/fc/v2/service/impl/TSysPermissionRoleServiceImpl.java
@@ -58,6 +58,12 @@ public class TSysPermissionRoleServiceImpl  extends ServiceImpl<TSysPermissionRo
         return this.baseMapper.selectList(queryWrapper);
     }
 
+    /**
+     * 查询角色权限中间列表
+     *
+     * @param tSysPermissionRole 角色权限中间
+     * @return 角色权限中间
+     */
     @Override
     public List<TSysPermissionRole> selectTSysPermissionRoleList(TSysPermissionRole tSysPermissionRole) {
     	Map<String, Object>  map = BeanUtil.beanToMap(tSysPermissionRole, true, true);
@@ -66,6 +72,17 @@ public class TSysPermissionRoleServiceImpl  extends ServiceImpl<TSysPermissionRo
     	return this.baseMapper.selectList(queryWrapper);
     }
 
+    /**
+     * 根据 Wrapper 条件，查询总记录数
+     *
+     * @param queryWrapper
+     * @return
+     */
+    @Override
+    public Integer selectCount(Wrapper<TSysPermissionRole> queryWrapper) {
+        return this.baseMapper.selectCount(queryWrapper);
+    }
+
     /**
      * 新增角色权限中间
      * 
diff --git a/src/main/java/com/fc/v2/service/impl/TSysPermissionServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysPermissionServiceImpl.java
index cc26fb51ef255fed6a0691d137272abcdb064b09..742cfec8edd0471d1ce4672f83271e180cbdd2b8 100644
--- a/src/main/java/com/fc/v2/service/impl/TSysPermissionServiceImpl.java
+++ b/src/main/java/com/fc/v2/service/impl/TSysPermissionServiceImpl.java
@@ -15,6 +15,7 @@ import com.fc.v2.service.ITSysPermissionRoleService;
 import com.fc.v2.service.ITSysPermissionService;
 import com.fc.v2.util.StringUtils;
 import com.github.pagehelper.PageHelper;
+import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.fc.v2.mapper.auto.TSysPermissionMapper;
@@ -124,34 +125,27 @@ public class TSysPermissionServiceImpl extends ServiceImpl<TSysPermissionMapper,
      * @return 结果
      */
     @Override
-    public int deleteTSysPermissionByIds(String ids) {
+    public ImmutablePair<Integer, String> deleteTSysPermissionByIds(String ids){
         //转成集合
         List<String> lista = ConvertUtil.toListStrArray(ids);
         List<Long> cdids = lista.stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
 
         //判断角色是否删除去除
         QueryWrapper<TSysPermissionRole> queryWrapper = new QueryWrapper<TSysPermissionRole>();
-        queryWrapper.in("permission_id" , cdids);
+        queryWrapper.in("permission_id", Arrays.asList(ConvertUtil.toStrArray(ids)));
 
-        List<TSysPermissionRole> tSysPermissionRoleList = itSysPermissionRoleService.selectTSysPermissionRoleList(queryWrapper);
-        if (tSysPermissionRoleList.size() > 0) {//有角色外键
-            return -2;
+        if (itSysPermissionRoleService.selectCount(queryWrapper) > 0){
+            return ImmutablePair.of(-1, "该权限绑定了角色，请解除角色绑定");
         }
 
         //判断是否有子集
-        List<TSysPermission> tsysPermissions = this.baseMapper.selectBatchIds(cdids);
-        boolean lag = false;
-        for (TSysPermission tSysPermission : tsysPermissions) {
-            if (tSysPermission.getChildCount() > 0) {
-                lag = true;
-            }
-        }
-
-        if (lag) {//有子集 无法删除
-            return -1;
+        QueryWrapper<TSysPermission> sysPermissionQueryWrapper = new QueryWrapper<TSysPermission>();
+        sysPermissionQueryWrapper.in("pid", Arrays.asList(ConvertUtil.toStrArray(ids)));
+        if (this.baseMapper.selectCount(sysPermissionQueryWrapper) > 0){
+            return ImmutablePair.of(-1, "该权限有子权限，请先删除子权限");
         }
 
-        return this.baseMapper.deleteBatchIds(cdids);
+        return ImmutablePair.of(this.baseMapper.deleteBatchIds(cdids),null);
     }
 
     /**
diff --git a/src/main/java/com/fc/v2/service/impl/TSysQuartzJobLogServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysQuartzJobLogServiceImpl.java
index ab6e94958b940887841c99fa4c53ece518b79487..4d514eb949bc1e637145b23275c0cf331a513a5c 100644
--- a/src/main/java/com/fc/v2/service/impl/TSysQuartzJobLogServiceImpl.java
+++ b/src/main/java/com/fc/v2/service/impl/TSysQuartzJobLogServiceImpl.java
@@ -119,4 +119,12 @@ public class TSysQuartzJobLogServiceImpl  extends ServiceImpl<TSysQuartzJobLogMa
     {
         return this.baseMapper.deleteById(id);
     }
+
+    /**
+     * 清空定时任务调度日志信息
+     */
+    @Override
+    public void cleanQuartzJobLog() {
+        tSysQuartzJobLogMapper.cleanQuartzJobLog();
+    }
 }
diff --git a/src/main/java/com/fc/v2/service/impl/TSysRoleServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysRoleServiceImpl.java
index 0dc809912764c6d87bf0be352f6346300f4a16ff..099b48cd762277184d194fb9bbc7c86a98ae382e 100644
--- a/src/main/java/com/fc/v2/service/impl/TSysRoleServiceImpl.java
+++ b/src/main/java/com/fc/v2/service/impl/TSysRoleServiceImpl.java
@@ -22,15 +22,16 @@ import com.fc.v2.model.auto.TSysRole;
 import com.fc.v2.common.support.ConvertUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 /**
  * 角色Service业务层处理
- * 
+ *
  * @author zhaonz
  * @date 2021-08-05
  */
 @Service
-public class TSysRoleServiceImpl  extends ServiceImpl<TSysRoleMapper, TSysRole> implements ITSysRoleService
-{
+public class TSysRoleServiceImpl extends ServiceImpl<TSysRoleMapper, TSysRole> implements ITSysRoleService {
+
     private static final Logger logger = LoggerFactory.getLogger(TSysRoleServiceImpl.class);
 
     @Autowired
@@ -41,91 +42,99 @@ public class TSysRoleServiceImpl  extends ServiceImpl<TSysRoleMapper, TSysRole>
 
     /**
      * 查询角色
-     * 
+     *
      * @param id 角色ID
      * @return 角色
      */
     @Override
-    public TSysRole selectTSysRoleById(Long id)
-    {
+    public TSysRole selectTSysRoleById(Long id) {
         return this.baseMapper.selectById(id);
     }
 
     /**
      * 查询角色列表
-     * 
+     *
      * @param queryWrapper 角色
      * @return 角色
      */
     @Override
-    public List<TSysRole> selectTSysRoleList(Wrapper<TSysRole> queryWrapper)
-    {
+    public List<TSysRole> selectTSysRoleList(Wrapper<TSysRole> queryWrapper) {
         return this.baseMapper.selectList(queryWrapper);
     }
 
+    /**
+     * 查询角色列表
+     *
+     * @param tSysRole 角色
+     * @return 角色集合
+     */
     @Override
     public List<TSysRole> selectTSysRoleList(TSysRole tSysRole) {
-    	Map<String, Object>  map = BeanUtil.beanToMap(tSysRole, true, true);
-    	QueryWrapper<TSysRole> queryWrapper = new QueryWrapper<TSysRole>();
-    	queryWrapper.allEq(map,false);
-    	return this.baseMapper.selectList(queryWrapper);
+        Map<String, Object> map = BeanUtil.beanToMap(tSysRole, true, true);
+        QueryWrapper<TSysRole> queryWrapper = new QueryWrapper<TSysRole>();
+        queryWrapper.allEq(map, false);
+        return this.baseMapper.selectList(queryWrapper);
     }
 
     /**
      * 新增角色
-     * 
+     *
      * @param tSysRole 角色
      * @return 结果
      */
     @Override
-    public int insertTSysRole(TSysRole tSysRole)
-    {
+    public int insertTSysRole(TSysRole tSysRole) {
         return this.baseMapper.insert(tSysRole);
     }
 
     /**
      * 修改角色
-     * 
+     *
      * @param tSysRole 角色
      * @return 结果
      */
     @Override
-    public int updateTSysRole(TSysRole tSysRole)
-    {
+    public int updateTSysRole(TSysRole tSysRole) {
         return this.baseMapper.updateById(tSysRole);
     }
 
     /**
      * 删除角色对象
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
     @Override
-    public int deleteTSysRoleByIds(String ids)
-    {
+    public int deleteTSysRoleByIds(String ids) {
+        QueryWrapper<TSysPermissionRole> queryWrapper = new QueryWrapper<TSysPermissionRole>();
+        queryWrapper.in("role_id", Arrays.asList(ConvertUtil.toStrArray(ids)));
+        permissionRoleService.deleteTSysPermissionRole(queryWrapper);
         return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids)));
     }
 
     /**
      * 删除角色信息
-     * 
+     *
      * @param id 角色ID
      * @return 结果
      */
     @Override
-    public int deleteTSysRoleById(Long id)
-    {
+    public int deleteTSysRoleById(Long id) {
         return this.baseMapper.deleteById(id);
     }
 
+    /**
+     * 根据用户id查询角色
+     *
+     * @param userid
+     * @return
+     */
     @Override
     public List<TSysRole> queryUserRole(Long userid) {
         return tSysRoleMapper.queryUserRole(userid);
     }
 
     /**
-     *
      * @param tsysRole
      * @return
      */
@@ -154,17 +163,13 @@ public class TSysRoleServiceImpl  extends ServiceImpl<TSysRoleMapper, TSysRole>
         //添加权限关联
         List<String> prems = ConvertUtil.toListStrArray(powerIds);
 
-        for (String pre : prems) {
+        prems.forEach(pre -> {
             TSysPermissionRole permissionRole = new TSysPermissionRole();
             permissionRole.setRoleId(roleId);
             permissionRole.setPermissionId(Long.parseLong(pre));
             list.add(permissionRole);
-        }
-
-        if (permissionRoleService.saveTSysPermissionRoleBatch(list)){
-            return list.size();
-        }
+        });
 
-        return 0;
+        return permissionRoleService.saveTSysPermissionRoleBatch(list) ? 1 : 0;
     }
 }
diff --git a/src/main/java/com/fc/v2/service/impl/TSysUserServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysUserServiceImpl.java
index 02a0313b6963853e0b5667439e201df88398c0da..48d79d0a5d3f55ff7dc63c452bdf4c4e133283d3 100644
--- a/src/main/java/com/fc/v2/service/impl/TSysUserServiceImpl.java
+++ b/src/main/java/com/fc/v2/service/impl/TSysUserServiceImpl.java
@@ -3,7 +3,6 @@ package com.fc.v2.service.impl;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Arrays;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -12,17 +11,11 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fc.v2.model.auto.TSysRole;
 import com.fc.v2.model.custom.RoleVo;
-import com.fc.v2.model.custom.Tablepar;
 import com.fc.v2.service.ITSysRoleService;
 import com.fc.v2.service.ITSysRoleUserService;
 import com.fc.v2.service.ITSysUserService;
 import com.fc.v2.util.MD5Util;
 import com.fc.v2.util.StringUtils;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-
-import cn.hutool.core.bean.BeanUtil;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.fc.v2.mapper.auto.TSysUserMapper;
@@ -40,7 +33,7 @@ import org.slf4j.LoggerFactory;
  */
 @Service
 public class TSysUserServiceImpl extends ServiceImpl<TSysUserMapper, TSysUser> implements ITSysUserService {
-	
+
     private static final Logger logger = LoggerFactory.getLogger(TSysUserServiceImpl.class);
 
     @Autowired
@@ -76,16 +69,13 @@ public class TSysUserServiceImpl extends ServiceImpl<TSysUserMapper, TSysUser> i
 
     /**
      * 查询用户列表
-     * 
+     *
      * @param tSysUser 用户
      * @return 用户
      */
     @Override
     public List<TSysUser> selectTSysUserList(TSysUser tSysUser) {
-    	Map<String, Object>  map = BeanUtil.beanToMap(tSysUser, true, true);
-    	QueryWrapper<TSysUser> queryWrapper = new QueryWrapper<TSysUser>();
-    	queryWrapper.allEq(map,false);
-    	return this.baseMapper.selectList(queryWrapper);
+        return tSysUserMapper.selectTSysUserList(tSysUser);
     }
 
     /**
@@ -118,6 +108,9 @@ public class TSysUserServiceImpl extends ServiceImpl<TSysUserMapper, TSysUser> i
      */
     @Override
     public int deleteTSysUserByIds(String ids) {
+        QueryWrapper<TSysRoleUser> queryWrapper = new QueryWrapper<TSysRoleUser>();
+        queryWrapper.in("sys_user_id", Arrays.asList(ConvertUtil.toStrArray(ids)));
+        itSysRoleUserService.deleteTSysRoleUser(queryWrapper);
         return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids)));
     }
 
@@ -132,23 +125,36 @@ public class TSysUserServiceImpl extends ServiceImpl<TSysUserMapper, TSysUser> i
         return this.baseMapper.deleteById(id);
     }
 
+    /**
+     * 新增用户
+     *
+     * @param user
+     * @param roleIds
+     * @return
+     */
     @Override
     public int insertUserRoles(TSysUser user, String roleIds) {
         user.setId(IdWorker.getId());
         if (StringUtils.isNotEmpty(roleIds)) {
             List<String> listRoles = ConvertUtil.toListStrArray(roleIds);
-            for (String rolesid : listRoles) {
+            listRoles.forEach(s -> {
                 TSysRoleUser tSysRoleUser = new TSysRoleUser();
                 tSysRoleUser.seTSysUserId(user.getId());
-                tSysRoleUser.setSysRoleId(Long.parseLong(rolesid));
+                tSysRoleUser.setSysRoleId(Long.parseLong(s));
                 itSysRoleUserService.insertTSysRoleUser(tSysRoleUser);
-            }
+            });
         }
 
         user.setPassword(MD5Util.encode(user.getPassword()));
         return this.baseMapper.insert(user);
     }
 
+    /**
+     * 检查LogingName
+     *
+     * @param tsysUser
+     * @return
+     */
     @Override
     public int checkLoginNameUnique(TSysUser tsysUser) {
         QueryWrapper<TSysUser> queryWrapper = new QueryWrapper<TSysUser>();
@@ -156,6 +162,12 @@ public class TSysUserServiceImpl extends ServiceImpl<TSysUserMapper, TSysUser> i
         return this.baseMapper.selectList(queryWrapper).size();
     }
 
+    /**
+     * 获取所有权限 并且增加是否有权限字段
+     *
+     * @param id
+     * @return
+     */
     @Override
     public List<RoleVo> getUserIsRole(Long id) {
         List<RoleVo> list = new ArrayList<RoleVo>();
@@ -184,22 +196,29 @@ public class TSysUserServiceImpl extends ServiceImpl<TSysUserMapper, TSysUser> i
         return list;
     }
 
+    /**
+     * 修改用户信息以及角色信息
+     *
+     * @param tsysUser
+     * @param roleIds
+     * @return
+     */
     @Override
     public int updateUserRoles(TSysUser tsysUser, String roleIds) {
         //先删除这个用户的所有角色
         QueryWrapper<TSysRoleUser> queryWrapper = new QueryWrapper<TSysRoleUser>();
         queryWrapper.eq("sys_user_id", tsysUser.getId());
-        itSysRoleUserService.remove(queryWrapper);
+        itSysRoleUserService.deleteTSysRoleUser(queryWrapper);
 
-        if(StringUtils.isNotEmpty(roleIds)) {
-            List<String> list_roles = ConvertUtil.toListStrArray(roleIds);
+        if (StringUtils.isNotEmpty(roleIds)) {
+            List<String> listRoles = ConvertUtil.toListStrArray(roleIds);
             //添加新的角色信息
-            for (String role : list_roles) {
+            listRoles.forEach(s -> {
                 TSysRoleUser tSysRoleUser = new TSysRoleUser();
                 tSysRoleUser.seTSysUserId(tsysUser.getId());
-                tSysRoleUser.setSysRoleId(Long.parseLong(role));
+                tSysRoleUser.setSysRoleId(Long.parseLong(s));
                 itSysRoleUserService.insertTSysRoleUser(tSysRoleUser);
-            }
+            });
         }
         //修改用户信息
         return this.updateTSysUser(tsysUser);
@@ -211,13 +230,12 @@ public class TSysUserServiceImpl extends ServiceImpl<TSysUserMapper, TSysUser> i
         return this.updateTSysUser(tsysUser);
     }
 
-    @Override
-    public PageInfo<TSysUser> userList(Tablepar tablepar) {
-        PageHelper.startPage(tablepar.getPage(), tablepar.getLimit());
-        List<TSysUser> list = tSysUserMapper.queryUserInfo(tablepar.getSearchText());
-        return new PageInfo<TSysUser>(list);
-    }
-
+    /**
+     * 根据用户名称查询
+     *
+     * @param username
+     * @return
+     */
     @Override
     public TSysUser queryUserName(String username) {
         return this.tSysUserMapper.queryUserName(username);
diff --git a/src/main/resources/mybatis/auto/TSysQuartzJobLogMapper.xml b/src/main/resources/mybatis/auto/TSysQuartzJobLogMapper.xml
index 3b482ac01f617614215d970f76fdfb7b38063d05..4d6f91233f53f43947a5c47b49d7630990f596a9 100644
--- a/src/main/resources/mybatis/auto/TSysQuartzJobLogMapper.xml
+++ b/src/main/resources/mybatis/auto/TSysQuartzJobLogMapper.xml
@@ -24,4 +24,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectTSysQuartzJobLogVo">
         select id, job_name, job_group, invoke_target, job_message, status, exception_info, start_time, end_time, create_by, create_time, update_by, update_time, remark from t_sys_quartz_job_log
     </sql>
+
+    <update id="cleanQuartzJobLog">
+        truncate table t_sys_quartz_job_log
+    </update>
+
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/auto/TsysOperLogMapper.xml b/src/main/resources/mybatis/auto/TsysOperLogMapper.xml
index 44e7e7b55678fc22bb024a2d52cf69b3434054d8..70d85e0263d6ab9d8565cff0de2259e7dc2e1ddc 100644
--- a/src/main/resources/mybatis/auto/TsysOperLogMapper.xml
+++ b/src/main/resources/mybatis/auto/TsysOperLogMapper.xml
@@ -23,4 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectTSysOperLogVo">
         select id, title, method, oper_name, oper_url, oper_param, error_msg, oper_time, create_by, create_time, update_by, update_time, remark from t_sys_oper_log
     </sql>
+
+    <update id="cleanTSysOperLog">
+        truncate table t_sys_oper_log
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/auto/TsysUserMapper.xml b/src/main/resources/mybatis/auto/TsysUserMapper.xml
index 22aac6aebaa99b84e56fe9561f90f197178f30e4..8e2566fef9fcdcef2430971b831556da4631290e 100644
--- a/src/main/resources/mybatis/auto/TsysUserMapper.xml
+++ b/src/main/resources/mybatis/auto/TsysUserMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fc.v2.mapper.auto.TSysUserMapper">
-    
+
     <resultMap type="com.fc.v2.model.auto.TSysUser" id="TSysUserResult">
         <result property="id"    column="id"    />
         <result property="username"    column="username"    />
@@ -37,4 +37,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectTSysUserVo">
         select id, username, password, nickname, dep_id, pos_id, create_by, create_time, update_by, update_time, remark from t_sys_user
     </sql>
+
+    <select id="selectTSysUserList" resultMap="BaseResultMap" parameterType="com.fc.v2.model.auto.TSysUser">
+        select
+        id,
+        username,
+        password,
+        nickname,
+        (select dept_name from t_sys_department dep where dep.id = tsu.dep_id) as dep_name,
+        (select post_name from t_sys_position pos where pos.id = tsu.pos_id) as pos_name,
+        dep_id,
+        pos_id
+        from t_sys_user tsu
+        <if test="username != null and username!=''" >
+            where  username= #{username}
+        </if>
+        order by id+0 DESC
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/static/component/pear/module/treetable.js b/src/main/resources/static/component/pear/module/treetable.js
index f6b4a888bc571785ac6c8c726558663128872e0a..db2b82c2200bd1cac5bc05d9c710da1ac86c11ce 100644
--- a/src/main/resources/static/component/pear/module/treetable.js
+++ b/src/main/resources/static/component/pear/module/treetable.js
@@ -1,13 +1,12 @@
-/**
- * 树形表格 1.x
- * date:2018-07-22   License By https://easyweb.vip
- */
 layui.define(['layer', 'table'], function (exports) {
     var $ = layui.jquery;
     var layer = layui.layer;
     var table = layui.table;
+	
+	var instances = [];
 
     var treetable = {
+		
         // 渲染树形表格
         render: function (param) {
             // 检查参数
@@ -18,31 +17,23 @@ layui.define(['layer', 'table'], function (exports) {
             if (param.data) {
                 treetable.init(param, param.data);
             } else {
-                 /* 原始
-                $.getJSON(param.url, param.where, function (res) {
-                    if(param.parseData){
-                        res.data = param.parseData(res);
-                        param.data = res.data;
-                    }
-                    treetable.init(param, res.data);
-                });*/
-                /**
-                 * 魔改方法支持自定义请求方式
-                 */
-                $.ajax({
-                    url: param.url,
-                    data:  param.where,
-                    dataType: 'json',
-                    type: param.method,
-                    success: function (res) {
-                        if(param.parseData){
-                            res.data = param.parseData(res);
-                            param.data = res.data;
-                        }
-                        treetable.init(param, res.data);
-                    }
-                })
-
+				if(param.method === 'post' || param.method === 'POST') {
+					$.post(param.url, param.where, function(res){
+						if(param.parseData){
+						    res = param.parseData(res);
+						    param.data = res.data;
+						}
+						treetable.init(param, res.data);
+					});
+				} else {
+					$.get(param.url, param.where, function(res){
+						if(param.parseData){
+						    res = param.parseData(res);
+						    param.data = res.data;
+						}
+						treetable.init(param, res.data);
+					});
+				}
             }
         },
         // 渲染表格
@@ -129,7 +120,21 @@ layui.define(['layer', 'table'], function (exports) {
 
             // 渲染表格
             table.render(param);
+			var result = instances.some(item=>item.key===param.elem);
+			if(!result){
+				instances.push({key:param.elem,value:param});
+			}
         },
+		// 表格重载
+		reload: function(elem) {
+			instances.forEach(function(item){
+				if(item.key === elem) {
+					// 清空
+					$(elem).next().remove();
+					treetable.render(item.value);
+				}
+			})
+		},
         // 计算缩进的数量
         getEmptyNum: function (pid, data) {
             var num = 0;
@@ -215,9 +220,7 @@ layui.define(['layer', 'table'], function (exports) {
             });
         }
     };
-
-
-
+	
     // 给图标列绑定事件
     $('body').on('click', '.treeTable .treeTable-icon', function () {
         var treeLinkage = $(this).parents('.treeTable').attr('treeLinkage');
diff --git a/src/main/resources/templates/admin/sysDepartment/add.html b/src/main/resources/templates/admin/sysDepartment/add.html
index 074dec1db6263f03f6f4d995f5e127159440be06..c7ca50bbd357eec5c5a98b09f8c2736fe462f2f9 100644
--- a/src/main/resources/templates/admin/sysDepartment/add.html
+++ b/src/main/resources/templates/admin/sysDepartment/add.html
@@ -12,7 +12,7 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">部门名称</label>
                     <div class="layui-input-block">
-                        <input type="text" name="deptName" lay-verify="title" autocomplete="off" placeholder="权限名称"
+                        <input type="text" name="deptName" lay-verify="title" autocomplete="off" placeholder="部门名称"
                                class="layui-input">
                     </div>
                 </div>
diff --git a/src/main/resources/templates/admin/sysDepartment/list.html b/src/main/resources/templates/admin/sysDepartment/list.html
index 105bba1b063a176358017348b463e1509c26fa84..24d69ce175acacca638b9d3d06915a07c9ff4754 100644
--- a/src/main/resources/templates/admin/sysDepartment/list.html
+++ b/src/main/resources/templates/admin/sysDepartment/list.html
@@ -10,7 +10,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">部门名称</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="powerName" placeholder="" class="layui-input">
+                    <input type="text" name="deptName" placeholder="" class="layui-input">
                 </div>
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="department-query">
                     <i class="layui-icon layui-icon-search"></i>
@@ -39,6 +39,14 @@
         <i class="layui-icon layui-icon-delete"></i>
         删除
     </button>
+    <button class="pear-btn pear-btn-success pear-btn-md" lay-event="expandAll">
+        <i class="layui-icon layui-icon-spread-left"></i>
+        展开
+    </button>
+    <button class="pear-btn pear-btn-success pear-btn-md" lay-event="foldAll">
+        <i class="layui-icon layui-icon-shrink-right"></i>
+        折叠
+    </button>
 </script>
 
 <script type="text/html" id="department-bar">
@@ -93,7 +101,7 @@
         });
 
         form.on('submit(department-query)', function (data) {
-            var keyword = data.field.powerName;
+            var keyword = data.field.deptName;
             var $tds = $('#department-table').next('.treeTable').find('.layui-table-body tbody tr td');
             if (!keyword) {
                 $tds.css('background-color', 'transparent');
@@ -136,6 +144,10 @@
                 window.refresh();
             } else if (obj.event === 'batchRemove') {
                 window.batchRemove(obj);
+            } else if(obj.event === 'expandAll'){
+                treetable.expandAll("#department-table");
+            } else if(obj.event === 'foldAll') {
+                treetable.foldAll("#department-table");
             }
         });
 
@@ -165,7 +177,7 @@
                         layer.msg(result.msg, {icon: 2, time: 1000});
                     }
                 }
-            })
+            });
         });
 
 
diff --git a/src/main/resources/templates/admin/dict_data/add.html b/src/main/resources/templates/admin/sysDictData/add.html
similarity index 100%
rename from src/main/resources/templates/admin/dict_data/add.html
rename to src/main/resources/templates/admin/sysDictData/add.html
diff --git a/src/main/resources/templates/admin/dict_data/edit.html b/src/main/resources/templates/admin/sysDictData/edit.html
similarity index 100%
rename from src/main/resources/templates/admin/dict_data/edit.html
rename to src/main/resources/templates/admin/sysDictData/edit.html
diff --git a/src/main/resources/templates/admin/dict_data/list.html b/src/main/resources/templates/admin/sysDictData/list.html
similarity index 91%
rename from src/main/resources/templates/admin/dict_data/list.html
rename to src/main/resources/templates/admin/sysDictData/list.html
index 49a055cf130331c67d424bbfad368259b3c005e1..3d1b8d68a68091d6c624cebcb99283ed8f3cb5f9 100644
--- a/src/main/resources/templates/admin/dict_data/list.html
+++ b/src/main/resources/templates/admin/sysDictData/list.html
@@ -8,9 +8,18 @@
     <div class="layui-card-body">
         <form class="layui-form" action="">
             <div class="layui-form-item">
-                <label class="layui-form-label">字典名称</label>
+                <label class="layui-form-label">字典键值</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="searchText" placeholder="" class="layui-input">
+                    <input type="text" name="dictValue" placeholder="" class="layui-input">
+                </div>
+
+                <label class="layui-form-label">状态</label>
+                <div class="layui-input-inline">
+                    <select name="status" class="layui-input">
+                        <option value="">请选择字典状态</option>
+                        <option value="0">启用</option>
+                        <option value="1">禁用</option>
+                    </select>
                 </div>
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="dictData-query">
                     <i class="layui-icon layui-icon-search"></i>
@@ -73,14 +82,14 @@
         let table = layui.table;
         let form = layui.form;
         let $ = layui.jquery;
-        let dictId= '[[${dictId}]]';
+        let  dictType='[[${dictType}]]';
 
         let MODULE_PATH = rootPath+"/DictDataController";
         let typeUrl= rootPath+"/DictTypeController/view";
         let cols = [
             [
                 {type: 'checkbox'},
-                {title: 'ID', field: 'id', align: 'center'},
+                {title: 'ID', field: 'id', align: 'center', hide: true},
                 {title: '字典排序', field: 'dictSort', align: 'left'},
                 {title: '字典标签', field: 'dictLabel', align: 'left'},
                 {title: '字典键值', field: 'dictValue', align: 'left'},
@@ -97,7 +106,7 @@
         //table表单列表
         table.render({
             elem: '#dictData-table',
-            url: MODULE_PATH + '/list?dictId='+dictId,
+            url: MODULE_PATH + '/list',
             page: true,
             method: 'get',
             cols: cols,
@@ -106,7 +115,12 @@
             defaultToolbar: [{
                 layEvent: 'refresh',
                 icon: 'layui-icon-refresh',
-            }, 'filter', 'print', 'exports']
+            }, 'filter', 'print', 'exports'],
+            where: {
+                dictType : dictType,
+                orderByColumn: "dictSort",
+                isAsc: "asc"
+            }
         });
 
         //table图标事件绑定
@@ -145,7 +159,7 @@
                 title: '新增',
                 shade: 0.1,
                 area: ['500px', '500px'],
-                content: MODULE_PATH + '/add?dictId=[[${dictId}]]'
+                content: MODULE_PATH + '/add?dictType=' + dictType
             });
         }
         //修改
diff --git a/src/main/resources/templates/admin/dict_type/add.html b/src/main/resources/templates/admin/sysDictType/add.html
similarity index 100%
rename from src/main/resources/templates/admin/dict_type/add.html
rename to src/main/resources/templates/admin/sysDictType/add.html
diff --git a/src/main/resources/templates/admin/dict_type/edit.html b/src/main/resources/templates/admin/sysDictType/edit.html
similarity index 100%
rename from src/main/resources/templates/admin/dict_type/edit.html
rename to src/main/resources/templates/admin/sysDictType/edit.html
diff --git a/src/main/resources/templates/admin/dict_type/list.html b/src/main/resources/templates/admin/sysDictType/list.html
similarity index 91%
rename from src/main/resources/templates/admin/dict_type/list.html
rename to src/main/resources/templates/admin/sysDictType/list.html
index ffefe3f256985302265ef25f3430f77cb148b75e..ddefbdfb1f095d0005ff8292cbf1ac911a3f987d 100644
--- a/src/main/resources/templates/admin/dict_type/list.html
+++ b/src/main/resources/templates/admin/sysDictType/list.html
@@ -10,7 +10,16 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">字典名称</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="searchText" placeholder="" class="layui-input">
+                    <input type="text" name="dictName" placeholder="" class="layui-input">
+                </div>
+
+                <label class="layui-form-label">状态</label>
+                <div class="layui-input-inline">
+                    <select name="status" class="layui-input">
+                        <option value="">请选择字典状态</option>
+                        <option value="0">启用</option>
+                        <option value="1">禁用</option>
+                    </select>
                 </div>
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="dictType-query">
                     <i class="layui-icon layui-icon-search"></i>
@@ -72,7 +81,7 @@
         let cols = [
             [
                 {type: 'checkbox'},
-                {title: 'ID', field: 'id', align: 'center'},
+                {title: 'ID', field: 'id', align: 'center', hide: true},
                 {title: '字典名称', field: 'dictName', align: 'left'},
                 {title: '字典类型', field: 'dictType', align: 'left'},
                 {title: '状态', field: 'status', align: 'center',toolbar: '#dictType-enable'},
@@ -95,7 +104,11 @@
             defaultToolbar: [{
                 layEvent: 'refresh',
                 icon: 'layui-icon-refresh',
-            }, 'filter', 'print', 'exports']
+            }, 'filter', 'print', 'exports'],
+            where: {
+                orderByColumn: "createTime",
+                isAsc: "desc"
+            }
         });
 
         //table图标事件绑定
@@ -150,7 +163,7 @@
 
         //查看字典数据
         window.view = function (obj) {
-            window.location.href=DICTDATA_PATH + "/view?dictId=" + obj.data['id'];
+            window.location.href=DICTDATA_PATH + "/view?dictType=" + obj.data['dictType'];
         }
 
         //删除
diff --git a/src/main/resources/templates/admin/email/add.html b/src/main/resources/templates/admin/sysEmail/add.html
similarity index 100%
rename from src/main/resources/templates/admin/email/add.html
rename to src/main/resources/templates/admin/sysEmail/add.html
diff --git a/src/main/resources/templates/admin/email/list.html b/src/main/resources/templates/admin/sysEmail/list.html
similarity index 91%
rename from src/main/resources/templates/admin/email/list.html
rename to src/main/resources/templates/admin/sysEmail/list.html
index b9cd1ef359ca8c256b81986c06aa0123e5b31aab..4c3d8481c2f10f6fb30b4f8232fc71853ce0dbbc 100644
--- a/src/main/resources/templates/admin/email/list.html
+++ b/src/main/resources/templates/admin/sysEmail/list.html
@@ -8,9 +8,14 @@
     <div class="layui-card-body">
         <form class="layui-form" action="">
             <div class="layui-form-item">
-                <label class="layui-form-label">名称</label>
+                <label class="layui-form-label">标题</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="searchText" placeholder="" class="layui-input">
+                    <input type="text" name="title" placeholder="" class="layui-input">
+                </div>
+
+                <label class="layui-form-label">发送人</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="createBy" placeholder="" class="layui-input">
                 </div>
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="email-query">
                     <i class="layui-icon layui-icon-search"></i>
@@ -66,7 +71,7 @@
         let cols = [
             [
                 {type: 'checkbox'},
-                {title: 'ID', field: 'id', align: 'center'},
+                {title: 'ID', field: 'id', align: 'center', hide: true},
                 {title: '接收人', field: 'receiversEmail', align: 'left'},
                 {title: '标题', field: 'title', align: 'left'},
                 {title: '发送人', field: 'createBy', align: 'left'},
@@ -87,7 +92,11 @@
             defaultToolbar: [{
                 layEvent: 'refresh',
                 icon: 'layui-icon-refresh',
-            }, 'filter', 'print', 'exports']
+            }, 'filter', 'print', 'exports'],
+            where: {
+                orderByColumn: "id",
+                isAsc: "desc"
+            }
         });
 
         //table图标事件绑定
diff --git a/src/main/resources/templates/admin/email/view.html b/src/main/resources/templates/admin/sysEmail/view.html
similarity index 100%
rename from src/main/resources/templates/admin/email/view.html
rename to src/main/resources/templates/admin/sysEmail/view.html
diff --git a/src/main/resources/templates/admin/file/add.html b/src/main/resources/templates/admin/sysFile/add.html
similarity index 100%
rename from src/main/resources/templates/admin/file/add.html
rename to src/main/resources/templates/admin/sysFile/add.html
diff --git a/src/main/resources/templates/admin/file/edit.html b/src/main/resources/templates/admin/sysFile/edit.html
similarity index 100%
rename from src/main/resources/templates/admin/file/edit.html
rename to src/main/resources/templates/admin/sysFile/edit.html
diff --git a/src/main/resources/templates/admin/file/list.html b/src/main/resources/templates/admin/sysFile/list.html
similarity index 92%
rename from src/main/resources/templates/admin/file/list.html
rename to src/main/resources/templates/admin/sysFile/list.html
index ea912f9fdac51d18b99988e5f4eb6e5b414f269d..55d0559fcf57995f38c246cbefbe5c54184a8071 100644
--- a/src/main/resources/templates/admin/file/list.html
+++ b/src/main/resources/templates/admin/sysFile/list.html
@@ -8,9 +8,14 @@
     <div class="layui-card-body">
         <form class="layui-form" action="">
             <div class="layui-form-item">
-                <label class="layui-form-label">名称</label>
+                <label class="layui-form-label">文件名称</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="searchText" placeholder="" class="layui-input">
+                    <input type="text" name="fileName" placeholder="" class="layui-input">
+                </div>
+
+                <label class="layui-form-label">创建人</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="createBy" placeholder="" class="layui-input">
                 </div>
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="sysFile-query">
                     <i class="layui-icon layui-icon-search"></i>
@@ -67,7 +72,7 @@
         let cols = [
             [
                 {type: 'checkbox'},
-                {title: 'ID', field: 'id', align: 'center'},
+                {title: 'ID', field: 'id', align: 'center', hide: true},
                 {title: '文件名字', field: 'fileName', align: 'left'},
                 {title: '桶名', field: 'bucketName', align: 'left'},
                 {title: '大小', field: 'fileSize', align: 'left'},
@@ -92,7 +97,11 @@
             defaultToolbar: [{
                 layEvent: 'refresh',
                 icon: 'layui-icon-refresh',
-            }, 'filter', 'print', 'exports']
+            }, 'filter', 'print', 'exports'],
+            where: {
+                orderByColumn: "id",
+                isAsc: "asc"
+            }
         });
 
         //table图标事件绑定
diff --git a/src/main/resources/templates/admin/sysNotice/list.html b/src/main/resources/templates/admin/sysNotice/list.html
index f321a7de3933592ead61e4ff72907aa7ec2fb14a..900a2c6d7b0d217ae1623a09b9ee2279dbfc34e9 100644
--- a/src/main/resources/templates/admin/sysNotice/list.html
+++ b/src/main/resources/templates/admin/sysNotice/list.html
@@ -10,7 +10,12 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">标题</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="searchText" placeholder="" class="layui-input">
+                    <input type="text" name="title" placeholder="" class="layui-input">
+                </div>
+
+                <label class="layui-form-label">创建人</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="createBy" placeholder="" class="layui-input">
                 </div>
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="sysNotice-query">
                     <i class="layui-icon layui-icon-search"></i>
@@ -77,7 +82,7 @@
         let cols = [
             [
                  {type: 'checkbox'},
-                {title: 'ID', field: 'id', align: 'center'},
+                {title: 'ID', field: 'id', align: 'center', hide: true},
                 {title: '标题', field: 'title', align: 'left'},
                 {title: '内容', field: 'content', align: 'left'},
                 {title: '类型', field: 'type', align: 'center',toolbar: '#sysNotice-type'},
@@ -99,7 +104,11 @@
             defaultToolbar: [{
                 layEvent: 'refresh',
                 icon: 'layui-icon-refresh',
-            }, 'filter', 'print', 'exports']
+            }, 'filter', 'print', 'exports'],
+            where: {
+                orderByColumn: "id",
+                isAsc: "asc"
+            }
         });
 
         //table图标事件绑定
diff --git a/src/main/resources/templates/admin/log/list.html b/src/main/resources/templates/admin/sysOperLog/list.html
similarity index 72%
rename from src/main/resources/templates/admin/log/list.html
rename to src/main/resources/templates/admin/sysOperLog/list.html
index d9089184a64553e17137fa3ff7897225faf3303e..eef1c06ec3ec4d39ad55679db187c6383cc81ae6 100644
--- a/src/main/resources/templates/admin/log/list.html
+++ b/src/main/resources/templates/admin/sysOperLog/list.html
@@ -10,8 +10,14 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">名称</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="searchText" placeholder="" class="layui-input">
+                    <input type="text" name="title" placeholder="" class="layui-input">
                 </div>
+
+                <label class="layui-form-label">用户</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="operName" placeholder="" class="layui-input">
+                </div>
+
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="log-query">
                     <i class="layui-icon layui-icon-search"></i>
                     查询
@@ -32,19 +38,25 @@
 </body>
 
 <script type="text/html" id="role-toolbar">
-    <button shiro:hasPermission="system:log:remove" class="pear-btn pear-btn-danger pear-btn-md" lay-event="batchRemove">
+    <button shiro:hasPermission="system:log:remove" class="pear-btn pear-btn-danger pear-btn-md"
+            lay-event="batchRemove">
         <i class="layui-icon layui-icon-delete"></i>
         删除
     </button>
+    <button shiro:hasPermission="system:log:remove" class="pear-btn pear-btn-danger pear-btn-md"
+            lay-event="clean">
+        <i class="layui-icon layui-icon-delete"></i>
+        清空日志
+    </button>
 </script>
 
 <script type="text/html" id="log-bar">
-    <button shiro:hasPermission="system:log:remove" class="pear-btn pear-btn-danger pear-btn-sm" lay-event="remove" title="删除"><i class="layui-icon layui-icon-delete"></i>
+    <button shiro:hasPermission="system:log:remove" class="pear-btn pear-btn-danger pear-btn-sm" lay-event="remove"
+            title="删除"><i class="layui-icon layui-icon-delete"></i>
     </button>
 </script>
 
 
-
 <th:block th:include="include :: footer"/>
 <script>
     layui.use(['table', 'form', 'jquery'], function () {
@@ -52,11 +64,11 @@
         let form = layui.form;
         let $ = layui.jquery;
 
-        let MODULE_PATH = rootPath+"/LogController";
+        let MODULE_PATH = rootPath + "/LogController";
         let cols = [
             [
                 {type: 'checkbox'},
-                {title: 'ID', field: 'id', align: 'left'},
+                {title: 'ID', field: 'id', align: 'left', hide: true},
                 {title: '日志名称', field: 'title', align: 'left'},
                 {title: '方法', field: 'method', align: 'left'},
                 {title: '时间', field: 'operTime', align: 'center'},
@@ -77,7 +89,11 @@
             defaultToolbar: [{
                 layEvent: 'refresh',
                 icon: 'layui-icon-refresh',
-            }, 'filter', 'print', 'exports']
+            }, 'filter', 'print', 'exports'],
+            where: {
+                orderByColumn: "id",
+                isAsc: "desc"
+            }
         });
 
         //table图标事件绑定
@@ -95,6 +111,8 @@
                 window.refresh();
             } else if (obj.event === 'batchRemove') {
                 window.batchRemove(obj);
+            } else if (obj.event === 'clean'){
+                window.clean();
             }
         });
 
@@ -116,7 +134,7 @@
                     type: 'delete',
                     success: function (result) {
                         layer.close(loading);
-                        if (result.code==200) {
+                        if (result.code == 200) {
                             layer.msg(result.msg, {icon: 1, time: 1000}, function () {
                                 obj.del();
                             });
@@ -149,7 +167,7 @@
                     type: 'delete',
                     success: function (result) {
                         layer.close(loading);
-                        if (result.code==200) {
+                        if (result.code == 200) {
                             layer.msg(result.msg, {icon: 1, time: 1000}, function () {
                                 table.reload('log-table');
                             });
@@ -160,6 +178,30 @@
                 })
             });
         }
+
+        //清空日志
+        window.clean = function(){
+            layer.confirm('确定要清空日志', {icon: 3, title: '提示'}, function (index) {
+                layer.close(index);
+                let loading = layer.load();
+                $.ajax({
+                    url: MODULE_PATH + "/clean",
+                    dataType: 'json',
+                    type: 'delete',
+                    success: function (result) {
+                        layer.close(loading);
+                        if (result.code == 200) {
+                            layer.msg(result.msg, {icon: 1, time: 1000}, function () {
+                                table.reload('log-table');
+                            });
+                        } else {
+                            layer.msg(result.msg, {icon: 2, time: 1000});
+                        }
+                    }
+                })
+            });
+        }
+
         //刷新按钮
         window.refresh = function () {
             table.reload('log-table');
diff --git a/src/main/resources/templates/admin/permission/add.html b/src/main/resources/templates/admin/sysPermission/add.html
similarity index 100%
rename from src/main/resources/templates/admin/permission/add.html
rename to src/main/resources/templates/admin/sysPermission/add.html
diff --git a/src/main/resources/templates/admin/permission/edit.html b/src/main/resources/templates/admin/sysPermission/edit.html
similarity index 100%
rename from src/main/resources/templates/admin/permission/edit.html
rename to src/main/resources/templates/admin/sysPermission/edit.html
diff --git a/src/main/resources/templates/admin/permission/list.html b/src/main/resources/templates/admin/sysPermission/list.html
similarity index 98%
rename from src/main/resources/templates/admin/permission/list.html
rename to src/main/resources/templates/admin/sysPermission/list.html
index bcb520f4ba4038bca3eccf7e12670b992c471bc9..2996401d0abeef63e5918552cf4f9cd696efc2ee 100644
--- a/src/main/resources/templates/admin/permission/list.html
+++ b/src/main/resources/templates/admin/sysPermission/list.html
@@ -10,7 +10,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">权限名称</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="powerName" placeholder="" class="layui-input">
+                    <input type="text" name="name" placeholder="" class="layui-input">
                 </div>
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="power-query">
                     <i class="layui-icon layui-icon-search"></i>
@@ -103,7 +103,7 @@
         });
 
         form.on('submit(power-query)', function (data) {
-            var keyword = data.field.powerName;
+            var keyword = data.field.name;
             var $tds = $('#power-table').next('.treeTable').find('.layui-table-body tbody tr td');
             if (!keyword) {
                 $tds.css('background-color', 'transparent');
diff --git a/src/main/resources/templates/admin/permission/tree.html b/src/main/resources/templates/admin/sysPermission/tree.html
similarity index 100%
rename from src/main/resources/templates/admin/permission/tree.html
rename to src/main/resources/templates/admin/sysPermission/tree.html
diff --git a/src/main/resources/templates/admin/sysPosition/add.html b/src/main/resources/templates/admin/sysPosition/add.html
index 11891116de04360d060842bbc14758ef31900e18..e1897bbd7b298b751b002d1f41c93ba3599673bd 100644
--- a/src/main/resources/templates/admin/sysPosition/add.html
+++ b/src/main/resources/templates/admin/sysPosition/add.html
@@ -11,7 +11,7 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">岗位名称</label>
                     <div class="layui-input-block">
-                        <input type="text" name="postName" lay-verify="postName" autocomplete="off" placeholder="登录名称" class="layui-input">
+                        <input type="text" name="postName" lay-verify="postName" autocomplete="off" placeholder="岗位名称" class="layui-input">
                     </div>
                 </div>
                 <div class="layui-form-item">
diff --git a/src/main/resources/templates/admin/sysPosition/edit.html b/src/main/resources/templates/admin/sysPosition/edit.html
index 6ab54e7a107f614db57b907e6a407db73b77d04a..ddc097e282dc6697f0c935878df7e3329b6620d9 100644
--- a/src/main/resources/templates/admin/sysPosition/edit.html
+++ b/src/main/resources/templates/admin/sysPosition/edit.html
@@ -18,7 +18,7 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">岗位名称</label>
                     <div class="layui-input-block">
-                        <input th:value="*{postName}" type="text" name="postName" lay-verify="postName" autocomplete="off" placeholder="登录名称" class="layui-input">
+                        <input th:value="*{postName}" type="text" name="postName" lay-verify="postName" autocomplete="off" placeholder="岗位名称" class="layui-input">
                     </div>
                 </div>
 
diff --git a/src/main/resources/templates/admin/sysPosition/list.html b/src/main/resources/templates/admin/sysPosition/list.html
index 7bed0145ba4d35923e78778b6ec240f58251453e..5e13c197622445a0a377315ffe248365c1a19458 100644
--- a/src/main/resources/templates/admin/sysPosition/list.html
+++ b/src/main/resources/templates/admin/sysPosition/list.html
@@ -10,7 +10,16 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">岗位名称</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="searchText" placeholder="" class="layui-input">
+                    <input type="text" name="postName" placeholder="" class="layui-input">
+                </div>
+
+                <label class="layui-form-label">状态</label>
+                <div class="layui-input-inline">
+                    <select name="status" class="layui-input">
+                        <option value="">请选择状态</option>
+                        <option value="1">开启</option>
+                        <option value="0">关闭</option>
+                    </select>
                 </div>
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="position-query">
                     <i class="layui-icon layui-icon-search"></i>
@@ -69,7 +78,7 @@
         let cols = [
             [
                 {type: 'checkbox'},
-                {title: 'ID', field: 'id', align: 'center'},
+                {title: 'ID', field: 'id', align: 'center', hide: true},
                 {title: '岗位名称', field: 'postName', align: 'center'},
                 {title: '排序号', field: 'orderNum', align: 'center'},
                 {title: '状态', field: 'status', align: 'center',templet: '#position-enable'},
@@ -89,7 +98,11 @@
             defaultToolbar: [{
                 layEvent: 'refresh',
                 icon: 'layui-icon-refresh',
-            }, 'filter', 'print', 'exports']
+            }, 'filter', 'print', 'exports'],
+            where: {
+                orderByColumn: "id",
+                isAsc: "asc"
+            }
         });
 
         //table图标事件绑定
diff --git a/src/main/resources/templates/admin/province/list.html b/src/main/resources/templates/admin/sysProvince/list.html
similarity index 100%
rename from src/main/resources/templates/admin/province/list.html
rename to src/main/resources/templates/admin/sysProvince/list.html
diff --git a/src/main/resources/templates/admin/province/sysArea/add.html b/src/main/resources/templates/admin/sysProvince/sysArea/add.html
similarity index 100%
rename from src/main/resources/templates/admin/province/sysArea/add.html
rename to src/main/resources/templates/admin/sysProvince/sysArea/add.html
diff --git a/src/main/resources/templates/admin/province/sysArea/edit.html b/src/main/resources/templates/admin/sysProvince/sysArea/edit.html
similarity index 100%
rename from src/main/resources/templates/admin/province/sysArea/edit.html
rename to src/main/resources/templates/admin/sysProvince/sysArea/edit.html
diff --git a/src/main/resources/templates/admin/province/sysArea/list.html b/src/main/resources/templates/admin/sysProvince/sysArea/list.html
similarity index 91%
rename from src/main/resources/templates/admin/province/sysArea/list.html
rename to src/main/resources/templates/admin/sysProvince/sysArea/list.html
index 68b0329d99130be697ae94af9ce4ebc077a955ac..89e00f9c2c1fcf5794acbaebf58c44e3b59659ad 100644
--- a/src/main/resources/templates/admin/province/sysArea/list.html
+++ b/src/main/resources/templates/admin/sysProvince/sysArea/list.html
@@ -8,10 +8,16 @@
     <div class="layui-card-body">
         <form class="layui-form" action="">
             <div class="layui-form-item">
-                <label class="layui-form-label">名称</label>
+                <label class="layui-form-label">区代码</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="searchText" placeholder="" class="layui-input">
+                    <input type="text" name="areaCode" placeholder="" class="layui-input">
                 </div>
+
+                <label class="layui-form-label">区名称</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="areaName" placeholder="" class="layui-input">
+                </div>
+
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="sysArea-query">
                     <i class="layui-icon layui-icon-search"></i>
                     查询
@@ -73,10 +79,10 @@
         let cols = [
             [
                 {type: 'checkbox'},
-                {title: 'ID', field: 'id', align: 'center'},
+                {title: 'ID', field: 'id', align: 'center', hide: true},
                 {title: '区代码', field: 'areaCode', align: 'left'},
                 {title: '父级市代码', field: 'cityCode', align: 'left'},
-                {title: '市名称', field: 'areaName', align: 'left'},
+                {title: '区名称', field: 'areaName', align: 'left'},
                 {title: '简称', field: 'shortName', align: 'left'},
                 {title: '经度', field: 'lng', align: 'left'},
                 {title: '纬度', field: 'lat', align: 'left'},
@@ -98,7 +104,11 @@
             defaultToolbar: [{
                 layEvent: 'refresh',
                 icon: 'layui-icon-refresh',
-            }, 'filter', 'print', 'exports']
+            }, 'filter', 'print', 'exports'],
+            where: {
+                orderByColumn: "id",
+                isAsc: "asc"
+            }
         });
 
         //table图标事件绑定
diff --git a/src/main/resources/templates/admin/province/sysCity/add.html b/src/main/resources/templates/admin/sysProvince/sysCity/add.html
similarity index 100%
rename from src/main/resources/templates/admin/province/sysCity/add.html
rename to src/main/resources/templates/admin/sysProvince/sysCity/add.html
diff --git a/src/main/resources/templates/admin/province/sysCity/edit.html b/src/main/resources/templates/admin/sysProvince/sysCity/edit.html
similarity index 100%
rename from src/main/resources/templates/admin/province/sysCity/edit.html
rename to src/main/resources/templates/admin/sysProvince/sysCity/edit.html
diff --git a/src/main/resources/templates/admin/province/sysCity/list.html b/src/main/resources/templates/admin/sysProvince/sysCity/list.html
similarity index 93%
rename from src/main/resources/templates/admin/province/sysCity/list.html
rename to src/main/resources/templates/admin/sysProvince/sysCity/list.html
index 97505d604163d7b92c46b56fa79e1a27f2f6db4a..c7a25b9455a1116c3bea04b5dffe582af95c73a2 100644
--- a/src/main/resources/templates/admin/province/sysCity/list.html
+++ b/src/main/resources/templates/admin/sysProvince/sysCity/list.html
@@ -8,10 +8,16 @@
     <div class="layui-card-body">
         <form class="layui-form" action="">
             <div class="layui-form-item">
-                <label class="layui-form-label">名称</label>
+                <label class="layui-form-label">市代码</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="searchText" placeholder="" class="layui-input">
+                    <input type="text" name="cityCode" placeholder="" class="layui-input">
                 </div>
+
+                <label class="layui-form-label">市名称</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="cityName" placeholder="" class="layui-input">
+                </div>
+
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="sysCity-query">
                     <i class="layui-icon layui-icon-search"></i>
                     查询
@@ -72,7 +78,7 @@
         let cols = [
             [
                 {type: 'checkbox'},
-                {title: 'ID', field: 'id', align: 'center'},
+                {title: 'ID', field: 'id', align: 'center', hide: true},
                 {title: '市代码', field: 'cityCode', align: 'left'},
                 {title: '市名称', field: 'cityName', align: 'left'},
                 {title: '简称', field: 'shortName', align: 'left'},
@@ -97,7 +103,11 @@
             defaultToolbar: [{
                 layEvent: 'refresh',
                 icon: 'layui-icon-refresh',
-            }, 'filter', 'print', 'exports']
+            }, 'filter', 'print', 'exports'],
+            where: {
+                orderByColumn: "id",
+                isAsc: "asc"
+            }
         });
 
         //table图标事件绑定
diff --git a/src/main/resources/templates/admin/province/sysProvince/add.html b/src/main/resources/templates/admin/sysProvince/sysProvince/add.html
similarity index 100%
rename from src/main/resources/templates/admin/province/sysProvince/add.html
rename to src/main/resources/templates/admin/sysProvince/sysProvince/add.html
diff --git a/src/main/resources/templates/admin/province/sysProvince/edit.html b/src/main/resources/templates/admin/sysProvince/sysProvince/edit.html
similarity index 100%
rename from src/main/resources/templates/admin/province/sysProvince/edit.html
rename to src/main/resources/templates/admin/sysProvince/sysProvince/edit.html
diff --git a/src/main/resources/templates/admin/province/sysProvince/list.html b/src/main/resources/templates/admin/sysProvince/sysProvince/list.html
similarity index 93%
rename from src/main/resources/templates/admin/province/sysProvince/list.html
rename to src/main/resources/templates/admin/sysProvince/sysProvince/list.html
index 53fa833f390d49fe7aadde457c9a1ca821c79e0f..c23984334cfe4628d5a950c3c68b6699b178eca2 100644
--- a/src/main/resources/templates/admin/province/sysProvince/list.html
+++ b/src/main/resources/templates/admin/sysProvince/sysProvince/list.html
@@ -8,10 +8,16 @@
     <div class="layui-card-body">
         <form class="layui-form" action="">
             <div class="layui-form-item">
-                <label class="layui-form-label">名称</label>
+                <label class="layui-form-label">省份代码</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="searchText" placeholder="" class="layui-input">
+                    <input type="text" name="provinceCode" placeholder="" class="layui-input">
                 </div>
+
+                <label class="layui-form-label">省份名称</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="provinceName" placeholder="" class="layui-input">
+                </div>
+
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="sysProvince-query">
                     <i class="layui-icon layui-icon-search"></i>
                     查询
@@ -73,7 +79,7 @@
         let cols = [
             [
                 {type: 'checkbox'},
-                {title: 'ID', field: 'id', align: 'center'},
+                {title: 'ID', field: 'id', align: 'center', hide: true},
                 {title: '省份代码', field: 'provinceCode', align: 'left'},
                 {title: '省份名称', field: 'provinceName', align: 'left'},
                 {title: '简称', field: 'shortName', align: 'left'},
@@ -97,7 +103,11 @@
             defaultToolbar: [{
                 layEvent: 'refresh',
                 icon: 'layui-icon-refresh',
-            }, 'filter', 'print', 'exports']
+            }, 'filter', 'print', 'exports'],
+            where: {
+                orderByColumn: "id",
+                isAsc: "asc"
+            }
         });
 
         //table图标事件绑定
diff --git a/src/main/resources/templates/admin/province/sysStreet/add.html b/src/main/resources/templates/admin/sysProvince/sysStreet/add.html
similarity index 100%
rename from src/main/resources/templates/admin/province/sysStreet/add.html
rename to src/main/resources/templates/admin/sysProvince/sysStreet/add.html
diff --git a/src/main/resources/templates/admin/province/sysStreet/edit.html b/src/main/resources/templates/admin/sysProvince/sysStreet/edit.html
similarity index 100%
rename from src/main/resources/templates/admin/province/sysStreet/edit.html
rename to src/main/resources/templates/admin/sysProvince/sysStreet/edit.html
diff --git a/src/main/resources/templates/admin/province/sysStreet/list.html b/src/main/resources/templates/admin/sysProvince/sysStreet/list.html
similarity index 92%
rename from src/main/resources/templates/admin/province/sysStreet/list.html
rename to src/main/resources/templates/admin/sysProvince/sysStreet/list.html
index 1d810c5e62ea844a413484449437248e9ba5ab14..3bf1cb8dae2cf80d1c103b7d5c0dc984705175b0 100644
--- a/src/main/resources/templates/admin/province/sysStreet/list.html
+++ b/src/main/resources/templates/admin/sysProvince/sysStreet/list.html
@@ -8,10 +8,16 @@
     <div class="layui-card-body">
         <form class="layui-form" action="">
             <div class="layui-form-item">
-                <label class="layui-form-label">名称</label>
+                <label class="layui-form-label">街道代码</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="searchText" placeholder="" class="layui-input">
+                    <input type="text" name="streetCode" placeholder="" class="layui-input">
                 </div>
+
+                <label class="layui-form-label">街道名称</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="streetName" placeholder="" class="layui-input">
+                </div>
+
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="sysStreet-query">
                     <i class="layui-icon layui-icon-search"></i>
                     查询
@@ -73,7 +79,7 @@
         let cols = [
             [
                 {type: 'checkbox'},
-                {title: 'ID', field: 'id', align: 'center'},
+                {title: 'ID', field: 'id', align: 'center', hide: true},
                 {title: '街道代码', field: 'streetCode', align: 'left'},
                 {title: '父级区代码', field: 'areaCode', align: 'left'},
                 {title: '街道名称', field: 'streetName', align: 'left'},
@@ -98,7 +104,11 @@
             defaultToolbar: [{
                 layEvent: 'refresh',
                 icon: 'layui-icon-refresh',
-            }, 'filter', 'print', 'exports']
+            }, 'filter', 'print', 'exports'],
+            where: {
+                orderByColumn: "id",
+                isAsc: "asc"
+            }
         });
 
         //table图标事件绑定
diff --git a/src/main/resources/templates/admin/sysQuartzJob/list.html b/src/main/resources/templates/admin/sysQuartzJob/list.html
index 7d708a9a3d3a4ffc9e2b544dc7acba598c3da52e..92dd05cb323a97612024b122d445b04ad02b1673 100644
--- a/src/main/resources/templates/admin/sysQuartzJob/list.html
+++ b/src/main/resources/templates/admin/sysQuartzJob/list.html
@@ -8,9 +8,18 @@
     <div class="layui-card-body">
         <form class="layui-form" action="">
             <div class="layui-form-item">
-                <label class="layui-form-label">名称</label>
+                <label class="layui-form-label">任务名称</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="searchText" placeholder="" class="layui-input">
+                    <input type="text" name="jobName" placeholder="" class="layui-input">
+                </div>
+
+                <label class="layui-form-label">任务状态</label>
+                <div class="layui-input-inline">
+                    <select name="status" class="layui-input">
+                        <option value="">请选择任务状态</option>
+                        <option value="0">正常</option>
+                        <option value="1">暂停</option>
+                    </select>
                 </div>
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="sysQuartzJob-query">
                     <i class="layui-icon layui-icon-search"></i>
@@ -92,7 +101,7 @@
         let cols = [
             [
                 {type: 'checkbox'},
-                {title: 'ID', field: 'id', align: 'center'},
+                {title: 'ID', field: 'id', align: 'center', hide: true},
                 {title: '任务名称', field: 'jobName', align: 'left'},
                 {title: '任务组名', field: 'jobGroup', align: 'left'},
                 {title: '调用目标字符串', field: 'invokeTarget', align: 'left'},
@@ -116,7 +125,11 @@
             defaultToolbar: [{
                 layEvent: 'refresh',
                 icon: 'layui-icon-refresh',
-            }, 'filter', 'print', 'exports']
+            }, 'filter', 'print', 'exports'],
+            where: {
+                orderByColumn: "id",
+                isAsc: "desc"
+            }
         });
 
         //table图标事件绑定
diff --git a/src/main/resources/templates/admin/sysQuartzJobLog/list.html b/src/main/resources/templates/admin/sysQuartzJobLog/list.html
index 75b590427c526acf47e14595c34992e8159d1f9a..de67e56544d51caffc9ac4f8069bf32c98611922 100644
--- a/src/main/resources/templates/admin/sysQuartzJobLog/list.html
+++ b/src/main/resources/templates/admin/sysQuartzJobLog/list.html
@@ -8,9 +8,18 @@
     <div class="layui-card-body">
         <form class="layui-form" action="">
             <div class="layui-form-item">
-                <label class="layui-form-label">名称</label>
+                <label class="layui-form-label">任务名称</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="searchText" placeholder="" class="layui-input">
+                    <input type="text" name="jobName" placeholder="" class="layui-input">
+                </div>
+
+                <label class="layui-form-label">任务状态</label>
+                <div class="layui-input-inline">
+                    <select name="status" class="layui-input">
+                        <option value="">请选择任务状态</option>
+                        <option value="0">正常</option>
+                        <option value="1">失败</option>
+                    </select>
                 </div>
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="sysQuartzJobLog-query">
                     <i class="layui-icon layui-icon-search"></i>
@@ -36,6 +45,10 @@
         <i class="layui-icon layui-icon-delete"></i>
         删除
     </button>
+    <button shiro:hasPermission="gen:sysQuartzJobLog:remove" class="pear-btn pear-btn-danger pear-btn-md" lay-event="clean">
+        <i class="layui-icon layui-icon-delete"></i>
+        清空日志
+    </button>
 </script>
 
 <script type="text/html" id="sysQuartzJobLog-bar">
@@ -70,7 +83,7 @@
         let cols = [
             [
                 {type: 'checkbox'},
-                {title: 'ID', field: 'id', align: 'center'},
+                {title: 'ID', field: 'id', align: 'center', hide: true},
                 {title: '任务名称', field: 'jobName', align: 'left'},
                 {title: '任务组名', field: 'jobGroup', align: 'left'},
                 {title: '调用目标字符串', field: 'invokeTarget', align: 'left'},
@@ -94,7 +107,11 @@
             defaultToolbar: [{
                 layEvent: 'refresh',
                 icon: 'layui-icon-refresh',
-            }, 'filter', 'print', 'exports']
+            }, 'filter', 'print', 'exports'],
+            where: {
+                orderByColumn: "id",
+                isAsc: "desc"
+            }
         });
 
         //table图标事件绑定
@@ -112,6 +129,8 @@
                 window.refresh();
             } else if (obj.event === 'batchRemove') {
                 window.batchRemove(obj);
+            } else if (obj.event === 'clean'){
+                window.clean();
             }
         });
 
@@ -156,6 +175,30 @@
             });
         }
 
+        //清空
+        window.clean = function(){
+            layer.confirm('确定要清空定时任务日志', {icon: 3, title: '提示'}, function (index) {
+                layer.close(index);
+                let loading = layer.load();
+                $.ajax({
+                    url: MODULE_PATH + "/clean",
+                    dataType: 'json',
+                    type: 'delete',
+                    success: function (result) {
+                        layer.close(loading);
+                        if (result.code==200) {
+                            layer.msg(result.msg, {icon: 1, time: 1000}, function () {
+                                // obj.del();
+                                table.reload('sysQuartzJobLog-table');
+                            });
+                        } else {
+                            layer.msg(result.msg, {icon: 2, time: 1000});
+                        }
+                    }
+                })
+            });
+        }
+
         //批量删除
         window.batchRemove = function (obj) {
             let data = table.checkStatus(obj.config.id).data;
diff --git a/src/main/resources/templates/admin/role/add.html b/src/main/resources/templates/admin/sysRole/add.html
similarity index 78%
rename from src/main/resources/templates/admin/role/add.html
rename to src/main/resources/templates/admin/sysRole/add.html
index 4a0aa3497947779040e7ad7aaf1a538e4ebcf8e9..0da5c46242f54dc00e5787078010ce1be142d269 100644
--- a/src/main/resources/templates/admin/role/add.html
+++ b/src/main/resources/templates/admin/sysRole/add.html
@@ -9,9 +9,9 @@
         <div class="main-container">
             <div class="main-container">
                 <div class="layui-form-item">
-                    <label class="layui-form-label">名称</label>
+                    <label class="layui-form-label">角色名称</label>
                     <div class="layui-input-block">
-                        <input type="text" name="name" lay-verify="rolename" autocomplete="off" placeholder="请输入标题"
+                        <input type="text" name="name" lay-verify="rolename" autocomplete="off" placeholder="请输入角色名称"
                                class="layui-input">
                     </div>
                 </div>
@@ -37,33 +37,14 @@
         let form = layui.form;
         let $ = layui.jquery;
 
-
         form.verify({
             rolename: function(value){
                 if(value.length < 2){
                     return '标题至少得5个字符啊';
                 }
-                var msg = "";
-                $.ajax({
-                    url: rootPath+'/RoleController/checkNameUnique',
-                    data: "name="+value,
-                    dataType: 'json',
-                    type: 'post',
-                    async:false,
-                    success: function (result) {
-                            msg=result;
-                    }
-                });
-                if (msg == 1) {
-                   return "已有相同数据";
-                }
-
             }
         });
 
-
-
-
         form.on('submit(role-save)', function (data) {
             $.ajax({
                 url: rootPath+'/RoleController/add',
diff --git a/src/main/resources/templates/admin/role/edit.html b/src/main/resources/templates/admin/sysRole/edit.html
similarity index 100%
rename from src/main/resources/templates/admin/role/edit.html
rename to src/main/resources/templates/admin/sysRole/edit.html
diff --git a/src/main/resources/templates/admin/role/list.html b/src/main/resources/templates/admin/sysRole/list.html
similarity index 95%
rename from src/main/resources/templates/admin/role/list.html
rename to src/main/resources/templates/admin/sysRole/list.html
index 85166f46abb3317b50b5a06397c8badc35ac1c3f..2ae5584df95c35ba8a190e6aa8888e664f796d0f 100644
--- a/src/main/resources/templates/admin/role/list.html
+++ b/src/main/resources/templates/admin/sysRole/list.html
@@ -10,7 +10,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">角色名</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="searchText" placeholder="" class="layui-input">
+                    <input type="text" name="name" placeholder="" class="layui-input">
                 </div>
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="role-query">
                     <i class="layui-icon layui-icon-search"></i>
@@ -69,7 +69,7 @@
         let cols = [
             [
                 {type: 'checkbox'},
-                {title: 'ID', field: 'id', align: 'center'},
+                {title: 'ID', field: 'id', align: 'center', hide: true},
                 {title: '角色名', field: 'name', align: 'center'},
                 {title: '操作', toolbar: '#role-bar', align: 'center'}
             ]
@@ -86,7 +86,11 @@
             defaultToolbar: [{
                 layEvent: 'refresh',
                 icon: 'layui-icon-refresh',
-            }, 'filter', 'print', 'exports']
+            }, 'filter', 'print', 'exports'],
+            where: {
+                orderByColumn: "id",
+                isAsc: "desc"
+            }
         });
 
         table.on('tool(role-table)', function (obj) {
diff --git a/src/main/resources/templates/admin/user/add.html b/src/main/resources/templates/admin/sysUser/add.html
similarity index 91%
rename from src/main/resources/templates/admin/user/add.html
rename to src/main/resources/templates/admin/sysUser/add.html
index c499f7947039fe7208653b8d416b93bf3f3537b1..a03786ab264580eba7750f2a153c9189422dfbd7 100644
--- a/src/main/resources/templates/admin/user/add.html
+++ b/src/main/resources/templates/admin/sysUser/add.html
@@ -92,26 +92,9 @@
                 if(value.length < 2){
                     return '标题至少得2个字符啊';
                 }
-                var msg = "";
-                $.ajax({
-                    url: MODULE_PATH+'/checkLoginNameUnique',
-                    data: "username="+value,
-                    dataType: 'json',
-                    type: 'post',
-                    async:false,
-                    success: function (result) {
-                            msg=result;
-                    }
-                });
-                if (msg == 1) {
-                   return "已有相同数据";
-                }
-
             }
         });
 
-
-
         //保存
         form.on('submit(user-save)', function (data) {
 
diff --git a/src/main/resources/templates/admin/user/edit.html b/src/main/resources/templates/admin/sysUser/edit.html
similarity index 100%
rename from src/main/resources/templates/admin/user/edit.html
rename to src/main/resources/templates/admin/sysUser/edit.html
diff --git a/src/main/resources/templates/admin/user/editPwd.html b/src/main/resources/templates/admin/sysUser/editPwd.html
similarity index 100%
rename from src/main/resources/templates/admin/user/editPwd.html
rename to src/main/resources/templates/admin/sysUser/editPwd.html
diff --git a/src/main/resources/templates/admin/user/list.html b/src/main/resources/templates/admin/sysUser/list.html
similarity index 96%
rename from src/main/resources/templates/admin/user/list.html
rename to src/main/resources/templates/admin/sysUser/list.html
index e324acf51c2f7f17065e1a3deddfcd6eaad3b7af..f1e0c2a5940bae941c32a94e4947bd59999251fe 100644
--- a/src/main/resources/templates/admin/user/list.html
+++ b/src/main/resources/templates/admin/sysUser/list.html
@@ -10,7 +10,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">登录名称</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="searchText" placeholder="" class="layui-input">
+                    <input type="text" name="username" placeholder="" class="layui-input">
                 </div>
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="role-query">
                     <i class="layui-icon layui-icon-search"></i>
@@ -72,7 +72,7 @@
         let cols = [
             [
                 {type: 'checkbox'},
-                {title: 'ID', field: 'id', align: 'center'},
+                {title: 'ID', field: 'id', align: 'center', hide: true},
                 {title: '昵称', field: 'nickname', align: 'center'},
                 {title: '登录名称', field: 'username', align: 'center'},
                 {title: '部门名称', field: 'depName', align: 'center'},
@@ -93,7 +93,11 @@
             defaultToolbar: [{
                 layEvent: 'refresh',
                 icon: 'layui-icon-refresh',
-            }, 'filter', 'print', 'exports']
+            }, 'filter', 'print', 'exports'],
+            where: {
+                orderByColumn: "id",
+                isAsc: "asc"
+            }
         });
 
         //table图标事件绑定