diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AreaController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AreaController.java
index 13fa20b79..eae18b8f6 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AreaController.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AreaController.java
@@ -208,11 +208,9 @@ public class AreaController extends BaseController {
     public HttpResult<List<AreaTreeDTO>> areaDeptTree(@RequestParam(required = false) @ApiParam("id") String id, @RequestParam("type") Integer type) {
         String methodDescribe = getMethodDescribe("areaDeptTree");
         List<AreaTreeDTO> result = areaService.areaDeptTree(id, type);
-        if (!result.isEmpty()) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
-        } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
-        }
+
+         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+
     }
 
     /**
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java
index 055c3b190..e5ec35181 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java
@@ -309,7 +309,7 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
     @Override
     public Page<AuditLogCusVO> censusAuditLog(AuditParam auditParam) {
         auditParam.setSearchBeginTime(DateUtil.beginOfDay(DateUtil.parse(auditParam.getSearchBeginTime())).toString());
-        auditParam.setSearchEndTime(DateUtil.endOfDay(DateUtil.parse(auditParam.getSearchBeginTime())).toString());
+        auditParam.setSearchEndTime(DateUtil.endOfDay(DateUtil.parse(auditParam.getSearchEndTime())).toString());
         //待分页数据总量
         Page<AuditLogCusVO> page = auditMapper.selectCensusAuditLog(new Page<>(auditParam.getPageNum(), auditParam.getPageSize()), auditParam);
         return page;
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java
index 059e58fff..924d37b18 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java
@@ -11,7 +11,6 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.system.pojo.dto.AreaTreeDTO;
-import com.njcn.system.pojo.po.Area;
 import com.njcn.user.pojo.dto.DeptDTO;
 import com.njcn.user.pojo.param.DeptParam;
 import com.njcn.user.pojo.po.Dept;
@@ -20,13 +19,12 @@ import com.njcn.user.pojo.vo.DeptTreeVO;
 import com.njcn.user.pojo.vo.DeptVO;
 import com.njcn.user.pojo.vo.PvTerminalTreeVO;
 import com.njcn.user.service.IDeptService;
+import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
-import com.njcn.web.controller.BaseController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
@@ -74,11 +72,8 @@ public class DeptController extends BaseController {
     public HttpResult<Object> getAreaTree(@RequestParam(required = false)@ApiParam("id")String id , @RequestParam("type") Integer type) {
         String methodDescribe = getMethodDescribe("getAreaTree");
         List<AreaTreeDTO> result = deptService.getAreaTree(id,type);
-        if (!result.isEmpty()) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
-        } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+
     }
 
     /**
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java
index eb8c2b762..cf4e2f07a 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java
@@ -196,6 +196,9 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
         List<String> areaTreeVO = deptArea();
         HttpResult<List<AreaTreeDTO>> areaTreeDTOS = areaFeignClient.areaDeptTree(id, type);
         List<AreaTreeDTO> list = areaTreeDTOS.getData();
+        if(CollectionUtils.isEmpty(list)){
+            return  new ArrayList<>();
+        }
         for (AreaTreeDTO areaTreeVOList : list) {
             if (areaTreeVO.contains(areaTreeVOList.getId())) {
                 areaTreeVOList.setName(areaTreeVOList.getName() + "(已被绑定)");