diff --git a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/LogicDeviceLineServiceImpl.java b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/LogicDeviceLineServiceImpl.java
index b06afb64d..267a15da5 100644
--- a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/LogicDeviceLineServiceImpl.java
+++ b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/LogicDeviceLineServiceImpl.java
@@ -25,6 +25,7 @@ import com.njcn.energy.pojo.param.GroupArrParam;
 import com.njcn.energy.pojo.po.*;
 import com.njcn.energy.pojo.vo.*;
 import com.njcn.energy.service.*;
+import com.njcn.influxdb.param.InfluxDBPublicParam;
 import com.njcn.influxdb.utils.InfluxDbUtils;
 import lombok.RequiredArgsConstructor;
 import org.influxdb.dto.QueryResult;
@@ -416,7 +417,7 @@ public class LogicDeviceLineServiceImpl extends ServiceImpl<LogicDeviceLineMappe
                                         stringBuilderMax.append(listData.get(j).getName()).append(", ");
                                     }
                                 }
-                                stringBuilderMax.append("from ").append(tableName + "_Real").append(" where").append(" LineId='" + lineId + "'").append(" order by time");
+                                stringBuilderMax.append("from ").append(tableName + "_Real").append(" where").append(" LineId='" + lineId + "'").append(" order by time").append(InfluxDBPublicParam.TIME_ZONE);
                                 List<Map<String, Object>> list = influxDbUtils.getResult(stringBuilderMax.toString(), "");
                                 if (CollectionUtil.isNotEmpty(list)) {
                                     for(int i=0;i<list.size();i++){
diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DictDataParam.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DictDataParam.java
index 1f0f9d865..7bbf1a9e8 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DictDataParam.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DictDataParam.java
@@ -50,6 +50,10 @@ public class DictDataParam  {
     private Integer algoDescribe;
 
 
+    @ApiModelProperty("字典值")
+    private String value;
+
+
     /**
      * 更新操作实体
      */
diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/DictData.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/DictData.java
index 53cc4088f..efab8f3f7 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/DictData.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/DictData.java
@@ -53,6 +53,8 @@ public class DictData extends BaseEntity {
      */
     private Integer algoDescribe;
 
+    private String value;
+
     /**
      * 状态：0-删除 1-正常
      */
diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DictDataVO.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DictDataVO.java
index ee8e710fd..0f31eede7 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DictDataVO.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DictDataVO.java
@@ -50,6 +50,11 @@ public class DictDataVO implements Serializable {
      */
     private Integer algoDescribe;
 
+    /**
+     * 字典值
+     */
+    private String value;
+
     /**
      * 状态：0-删除 1-正常
      */
diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java b/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java
index ed97113aa..1099ffd2e 100644
--- a/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java
@@ -86,4 +86,10 @@ public interface DeptFeignClient {
     @GetMapping("/getDepSonIdByDeptId")
     HttpResult<List<String>> getDepSonIdByDeptId(@RequestParam("deptId") String deptId);
 
+    /**
+     * 根据部门id获取直接子部门及自身
+     */
+    @GetMapping("/getDirectSonSelf")
+    HttpResult<List<Dept>> getDirectSonSelf(@RequestParam("deptId") String deptId);
+
 }
diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java b/pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java
index 3c2b3b5eb..d37b6e18e 100644
--- a/pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java
@@ -93,6 +93,12 @@ public class DeptFeignClientFallbackFactory implements FallbackFactory<DeptFeign
                 log.error("{}异常，降级处理，异常为：{}","查询所有子孙部门异常",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<List<Dept>> getDirectSonSelf(String deptId) {
+                log.error("{}异常，降级处理，异常为：{}","查询所有子部门以及自身异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }
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 f35956284..4aeee5c8b 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
@@ -291,7 +291,7 @@ public class DeptController extends BaseController {
      */
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/getDeptByCode")
-    @ApiOperation("根据部门Id获取部门信息")
+    @ApiOperation("根据部门code获取部门信息")
     public HttpResult<Dept> getDeptByCode(@RequestParam("deptCode")String deptCode) {
         String methodDescribe = getMethodDescribe("getDeptByCode");
         Dept result = deptService.getDeptByCode(deptCode);
@@ -342,5 +342,24 @@ public class DeptController extends BaseController {
     }
 
 
+    /**
+     * 根据部门id获取直接子部门及自身
+     * @param deptId 部门编号
+     * @author cdf
+     * @date 2022/12/1
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/getDirectSonSelf")
+    @ApiOperation("根据部门id获取直接子部门及自身")
+    public HttpResult<List<Dept>> getDirectSonSelf(@RequestParam("deptId")String deptId){
+        String methodDescribe = getMethodDescribe("getDirectSonSelf");
+        List<Dept> deptList = deptService.getDirectSonSelf(deptId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deptList, methodDescribe);
+
+    }
+
+
+
+
 }
 
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java
index 2dc00df8d..be6512e8c 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java
@@ -2,6 +2,7 @@ package com.njcn.user.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.system.pojo.dto.AreaTreeDTO;
 import com.njcn.user.pojo.dto.DeptDTO;
 import com.njcn.user.pojo.param.DeptParam;
@@ -10,6 +11,7 @@ import com.njcn.user.pojo.vo.DeptAllTreeVO;
 import com.njcn.user.pojo.vo.DeptTreeVO;
 import com.njcn.user.pojo.vo.DeptVO;
 import com.njcn.user.pojo.vo.PvTerminalTreeVO;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -176,4 +178,12 @@ public interface IDeptService extends IService<Dept> {
      * @date 2022/7/13
      */
     List<String> getDepSonIdByDeptId(String id);
+
+    /**
+     * 根据部门deptId获取直接子部门及自身
+     * @param deptId 部门编号
+     * @author cdf
+     * @date 2022/12/1
+     */
+    List<Dept> getDirectSonSelf(String deptId);
 }
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 3b104a6bb..3fd0bdc3a 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
@@ -349,4 +349,12 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
         }
         return sonId;
     }
+
+    @Override
+    public List<Dept> getDirectSonSelf(String deptId) {
+        LambdaQueryWrapper<Dept> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(Dept::getPid,deptId).eq(Dept::getState, DataStateEnum.ENABLE.getCode()).
+        or().eq(Dept::getId,deptId);
+        return this.list(lambdaQueryWrapper);
+    }
 }