diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java
index da96eaf8..f5970216 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java
@@ -24,6 +24,7 @@ import lombok.extern.slf4j.Slf4j;
 import com.jero.modules.system.service.ISysPermissionDataRuleService;
 import com.jero.modules.system.service.ISysPermissionService;
 
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -61,16 +62,16 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
 	 */
 	@ApiOperation(value="部门权限表-分页列表查询", notes="部门权限表-分页列表查询")
 	@GetMapping(value = "/page")
-	public Result<?> queryPageList(SysDepartPermission sysDepartPermission,
+	public Result<IPage<SysDepartPermission>> queryPageList(SysDepartPermission sysDepartPermission,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<SysDepartPermission> queryWrapper = QueryGenerator.initQueryWrapper(sysDepartPermission, req.getParameterMap());
-		Page<SysDepartPermission> page = new Page<SysDepartPermission>(pageNo, pageSize);
+		Page<SysDepartPermission> page = new Page<>(pageNo, pageSize);
 		IPage<SysDepartPermission> pageList = sysDepartPermissionService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 * 添加
 	 *
@@ -79,11 +80,11 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
 	 */
 	@ApiOperation(value="部门权限表-添加", notes="部门权限表-添加")
 	@PostMapping(value = "/add")
-	public Result<?> add(@RequestBody SysDepartPermission sysDepartPermission) {
+	public Result<T> add(@RequestBody SysDepartPermission sysDepartPermission) {
 		sysDepartPermissionService.save(sysDepartPermission);
 		return Result.OK("操作成功!");
 	}
-	
+
 	/**
 	 * 编辑
 	 *
@@ -92,11 +93,11 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
 	 */
 	@ApiOperation(value="部门权限表-编辑", notes="部门权限表-编辑")
 	@PutMapping(value = "/edit")
-	public Result<?> edit(@RequestBody SysDepartPermission sysDepartPermission) {
+	public Result<T> edit(@RequestBody SysDepartPermission sysDepartPermission) {
 		sysDepartPermissionService.updateById(sysDepartPermission);
 		return Result.OK("操作成功!");
 	}
-	
+
 	/**
 	 * 通过id删除
 	 *
@@ -105,11 +106,11 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
 	 */
 	@ApiOperation(value="部门权限表-通过id删除", notes="部门权限表-通过id删除")
 	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+	public Result<T> delete(@RequestParam(name="id",required=true) String id) {
 		sysDepartPermissionService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 * 批量删除
 	 *
@@ -118,11 +119,11 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
 	 */
 	@ApiOperation(value="部门权限表-批量删除", notes="部门权限表-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+	public Result<T> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.sysDepartPermissionService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功！");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
@@ -131,7 +132,7 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
 	 */
 	@ApiOperation(value="部门权限表-通过id查询", notes="部门权限表-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+	public Result<SysDepartPermission> queryById(@RequestParam(name="id",required=true) String id) {
 		SysDepartPermission sysDepartPermission = sysDepartPermissionService.getById(id);
 		return Result.OK(sysDepartPermission);
 	}
@@ -154,8 +155,9 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
 	* @param response
 	* @return
 	*/
-	@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+//	@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+	@PostMapping("/importExcel")
+	public Result<SysDepartPermission> importExcel(HttpServletRequest request, HttpServletResponse response) {
 	  return super.importExcel(request, response, SysDepartPermission.class);
 	}
 
@@ -163,9 +165,9 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
 	* 部门管理授权查询数据规则数据
 	*/
 	@GetMapping(value = "/datarule/{permissionId}/{departId}")
-	public Result<?> loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("departId") String departId) {
+	public Result<Map<String, Object>> loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("departId") String departId) {
 		List<SysPermissionDataRule> list = sysPermissionDataRuleService.getPermRuleListByPermId(permissionId);
-		if(list==null || list.size()==0) {
+		if(list==null || list.isEmpty()) {
 			return Result.error("未找到权限配置信息");
 		}else {
 			Map<String,Object> map = new HashMap<>();
@@ -192,13 +194,14 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
 	  * @param request
 	  * @return
 	  */
-	 @RequestMapping(value = "/queryTreeListForDeptRole", method = RequestMethod.GET)
+//	 @RequestMapping(value = "/queryTreeListForDeptRole", method = RequestMethod.GET)
+	 @GetMapping("/queryTreeListForDeptRole")
 	 public Result<Map<String,Object>> queryTreeListForDeptRole(@RequestParam(name="departId",required=true) String departId,HttpServletRequest request) {
 		 Result<Map<String,Object>> result = new Result<>();
 		 //全部权限ids
 		 List<String> ids = new ArrayList<>();
 		 try {
-			 LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<SysPermission>();
+			 LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<>();
 			 query.eq(SysPermission::getDelFlag, CommonConstant.DEL_FLAG_0);
 			 query.orderByAsc(SysPermission::getSortNo);
 			 query.inSql(SysPermission::getId,"select permission_id  from sys_depart_permission where depart_id='"+departId+"'");
@@ -208,7 +211,7 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
 			 }
 			 List<TreeModel> treeList = new ArrayList<>();
 			 getTreeModelList(treeList, list, null);
-			 Map<String,Object> resMap = new HashMap<String,Object>();
+			 Map<String,Object> resMap = new HashMap<>();
 			 resMap.put("treeList", treeList); //全部树节点数据
 			 resMap.put("ids", ids);//全部树ids
 			 result.setResult(resMap);