fix 未选择部门时，查询用户返回空

jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java

@@ -33,6 +33,7 @@ import com.jero.modules.system.model.SysUserSysDepartModel;
 import com.jero.modules.system.service.*;
 import com.jero.modules.system.vo.SysDepartUsersVO;
 import com.jero.modules.system.vo.SysUserRoleVO;
+import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -602,6 +603,13 @@ public class SysUserController {
             params.setHeadRows(1);
             params.setNeedSave(true);
             try {
+                //导入Excel格式校验，看匹配的字段文本概率
+                Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), SysUser.class, params);
+                if(!t){
+                    errorLines++;
+                    errorMessage.add("导入Excel校验失败 ！");
+                    throw new RuntimeException("导入Excel校验失败 ！");
+                }
                 List<SysUser> listSysUsers = ExcelImportUtil.importExcel(file.getInputStream(), SysUser.class, params);
                 for (int i = 0; i < listSysUsers.size(); i++) {
                     int lineNumber = i + 3;
@@ -833,7 +841,7 @@ public class SysUserController {
      */
     @RequestMapping(value = "/departUserList", method = RequestMethod.GET)
     @RequiresPermissions("sys:user:list")
-    public Result<IPage<SysUser>> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+    public Result<?> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                  HttpServletRequest req) {
         Result<IPage<SysUser>> result = new Result<>();
@@ -844,7 +852,7 @@ public class SysUserController {
         List<String> subDepids = new ArrayList<>();
         //部门id为空时，返回空
         if(oConvertUtils.isEmpty(depId)){
-            return result;
+            return Result.OK(new ArrayList<>());
         }else{
             subDepids = sysDepartService.getSubDepIdsByDepId(depId);
         }