diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java
index d65122b..e3963c6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java
@@ -12,8 +12,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.meter.MeterOrganize;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.meter.MeterOrganize;
 import com.casic.missiles.service.meter.IMeterOrganizeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,7 +26,6 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -48,22 +47,23 @@
     @ApiOperation("计量组织列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<MeterOrganize>> listPage(@RequestBody OrganizeListRequest request) {
+    public ReturnDTO<PageInfoBT<MeterOrganize>> listPage(@RequestBody OrganizeListRequest request) throws Exception {
         Page<MeterOrganize> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(organizeService.listPage(page, request)));
     }
 
+
     @ApiOperation("计量组织列表")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<List<MeterOrganize>> list(@RequestBody OrganizeListRequest request) {
+    public ReturnDTO<List<MeterOrganize>> list(@RequestBody OrganizeListRequest request) throws Exception {
         return ReturnUtil.success(organizeService.list(request));
     }
 
     @ApiOperation("计量组织导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody OrganizeListRequest request) throws IOException {
+    public void export(@RequestBody OrganizeListRequest request) throws Exception {
         super.exportExcel(MeterOrganize.class, organizeService.list(request), ExportEnum.METER_ORGANIZE_EXPORT.getSheetName());
     }
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java
index d65122b..e3963c6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java
@@ -12,8 +12,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.meter.MeterOrganize;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.meter.MeterOrganize;
 import com.casic.missiles.service.meter.IMeterOrganizeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,7 +26,6 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -48,22 +47,23 @@
     @ApiOperation("计量组织列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<MeterOrganize>> listPage(@RequestBody OrganizeListRequest request) {
+    public ReturnDTO<PageInfoBT<MeterOrganize>> listPage(@RequestBody OrganizeListRequest request) throws Exception {
         Page<MeterOrganize> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(organizeService.listPage(page, request)));
     }
 
+
     @ApiOperation("计量组织列表")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<List<MeterOrganize>> list(@RequestBody OrganizeListRequest request) {
+    public ReturnDTO<List<MeterOrganize>> list(@RequestBody OrganizeListRequest request) throws Exception {
         return ReturnUtil.success(organizeService.list(request));
     }
 
     @ApiOperation("计量组织导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody OrganizeListRequest request) throws IOException {
+    public void export(@RequestBody OrganizeListRequest request) throws Exception {
         super.exportExcel(MeterOrganize.class, organizeService.list(request), ExportEnum.METER_ORGANIZE_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java
index 23629ce..65c19e3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java
@@ -10,6 +10,8 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -97,32 +99,39 @@
     /**
      * 计量专业
      */
-    @ExcelProperty("专业")
-    @ApiModelProperty(value = "计量专业", dataType = "String")
+    @DictCodeField(message = "计量专业不合法", cacheName = MeterDictCode.MEASURE_MAJOR)
+    @ApiModelProperty(value = "计量专业（字典code）", dataType = "String")
     @TableField("meter_major")
     private String meterMajor;
 
+    @ExcelProperty("专业")
+    @ApiModelProperty(value = "计量专业（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String meterMajorName;
+
     /**
      * 技术职务-字典code
      */
-    @ApiModelProperty(value = "技术职务字典code", dataType = "String")
+    @ApiModelProperty(value = "技术职务（字典code）", dataType = "String")
+    @DictCodeField(message = "技术职务不合法", cacheName = MeterDictCode.TECHNOLOGY_JOB)
     @TableField("technology_job")
     private String technologyJob;
 
     @ExcelProperty("技术职务")
-    @ApiModelProperty(value = "技术职务字典value", dataType = "String")
+    @ApiModelProperty(value = "技术职务（字典value）", dataType = "String")
     @TableField(exist = false)
     private String technologyJobName;
 
     /**
      * 行政职务-字典code
      */
-    @ApiModelProperty(value = "行政职务字典code", dataType = "String")
+    @ApiModelProperty(value = "行政职务（字典code）", dataType = "String")
+    @DictCodeField(message = "行政职务不合法", cacheName = MeterDictCode.ADMINISTRATION_JOB)
     @TableField("administration_job")
     private String administrationJob;
 
     @ExcelProperty("行政职务")
-    @ApiModelProperty(value = "行政职务字典value", dataType = "String")
+    @ApiModelProperty(value = "行政职务（字典value）", dataType = "String")
     @TableField(exist = false)
     private String administrationJobName;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java
index d65122b..e3963c6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java
@@ -12,8 +12,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.meter.MeterOrganize;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.meter.MeterOrganize;
 import com.casic.missiles.service.meter.IMeterOrganizeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,7 +26,6 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -48,22 +47,23 @@
     @ApiOperation("计量组织列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<MeterOrganize>> listPage(@RequestBody OrganizeListRequest request) {
+    public ReturnDTO<PageInfoBT<MeterOrganize>> listPage(@RequestBody OrganizeListRequest request) throws Exception {
         Page<MeterOrganize> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(organizeService.listPage(page, request)));
     }
 
+
     @ApiOperation("计量组织列表")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<List<MeterOrganize>> list(@RequestBody OrganizeListRequest request) {
+    public ReturnDTO<List<MeterOrganize>> list(@RequestBody OrganizeListRequest request) throws Exception {
         return ReturnUtil.success(organizeService.list(request));
     }
 
     @ApiOperation("计量组织导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody OrganizeListRequest request) throws IOException {
+    public void export(@RequestBody OrganizeListRequest request) throws Exception {
         super.exportExcel(MeterOrganize.class, organizeService.list(request), ExportEnum.METER_ORGANIZE_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java
index 23629ce..65c19e3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java
@@ -10,6 +10,8 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -97,32 +99,39 @@
     /**
      * 计量专业
      */
-    @ExcelProperty("专业")
-    @ApiModelProperty(value = "计量专业", dataType = "String")
+    @DictCodeField(message = "计量专业不合法", cacheName = MeterDictCode.MEASURE_MAJOR)
+    @ApiModelProperty(value = "计量专业（字典code）", dataType = "String")
     @TableField("meter_major")
     private String meterMajor;
 
+    @ExcelProperty("专业")
+    @ApiModelProperty(value = "计量专业（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String meterMajorName;
+
     /**
      * 技术职务-字典code
      */
-    @ApiModelProperty(value = "技术职务字典code", dataType = "String")
+    @ApiModelProperty(value = "技术职务（字典code）", dataType = "String")
+    @DictCodeField(message = "技术职务不合法", cacheName = MeterDictCode.TECHNOLOGY_JOB)
     @TableField("technology_job")
     private String technologyJob;
 
     @ExcelProperty("技术职务")
-    @ApiModelProperty(value = "技术职务字典value", dataType = "String")
+    @ApiModelProperty(value = "技术职务（字典value）", dataType = "String")
     @TableField(exist = false)
     private String technologyJobName;
 
     /**
      * 行政职务-字典code
      */
-    @ApiModelProperty(value = "行政职务字典code", dataType = "String")
+    @ApiModelProperty(value = "行政职务（字典code）", dataType = "String")
+    @DictCodeField(message = "行政职务不合法", cacheName = MeterDictCode.ADMINISTRATION_JOB)
     @TableField("administration_job")
     private String administrationJob;
 
     @ExcelProperty("行政职务")
-    @ApiModelProperty(value = "行政职务字典value", dataType = "String")
+    @ApiModelProperty(value = "行政职务（字典value）", dataType = "String")
     @TableField(exist = false)
     private String administrationJobName;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java
index aed3363..000e58a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java
@@ -4,7 +4,6 @@
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.OrganizeListRequest;
@@ -12,20 +11,21 @@
 import com.casic.missiles.dto.meter.ParentDeptResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.MeterDeptTypeEnum;
-import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.meter.MeterOrganizeMapper;
 import com.casic.missiles.model.meter.MeterOrganize;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IDeptService;
 import com.casic.missiles.service.meter.IMeterOrganizeService;
+import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -43,25 +43,33 @@
 public class MeterOrganizeServiceImpl extends ServiceImpl<MeterOrganizeMapper, MeterOrganize> implements IMeterOrganizeService {
     @Autowired
     private MeterOrganizeMapper organizeMapper;
-    @Resource
-    private AbstractDictService dictService;
     @Autowired
     private IDeptService deptService;
 
     @Override
-    public Page<MeterOrganize> listPage(Page<MeterOrganize> page, OrganizeListRequest request) {
+    public Page<MeterOrganize> listPage(Page<MeterOrganize> page, OrganizeListRequest request) throws Exception {
+        DictCodeUtils.validDictCode(request);
         QueryWrapper<MeterOrganize> wrapper = getWrapper(request);
         Page<MeterOrganize> organizePage = organizeMapper.selectPage(page, wrapper);
-        organizePage.getRecords().stream().forEach(result -> {
-            result.setAdministrationJobName(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB, result.getAdministrationJob()));
-            result.setTechnologyJobName(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB, result.getTechnologyJob()));
-        });
+        if(CollectionUtils.isEmpty(organizePage.getRecords())){
+            return new Page<>();
+        }
+        for (MeterOrganize record : organizePage.getRecords()) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         return organizePage;
     }
 
     @Override
-    public List<MeterOrganize> list(OrganizeListRequest request) {
+    public List<MeterOrganize> list(OrganizeListRequest request) throws Exception {
         QueryWrapper<MeterOrganize> wrapper = getWrapper(request);
+        List<MeterOrganize> meterOrganizes = organizeMapper.selectList(wrapper);
+        if(CollectionUtils.isEmpty(meterOrganizes)){
+            return new ArrayList<>();
+        }
+        for (MeterOrganize record : meterOrganizes) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         return organizeMapper.selectList(wrapper);
     }
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java
index d65122b..e3963c6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java
@@ -12,8 +12,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.meter.MeterOrganize;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.meter.MeterOrganize;
 import com.casic.missiles.service.meter.IMeterOrganizeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,7 +26,6 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -48,22 +47,23 @@
     @ApiOperation("计量组织列表（分页）")
     @PostMapping("/listPage")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<MeterOrganize>> listPage(@RequestBody OrganizeListRequest request) {
+    public ReturnDTO<PageInfoBT<MeterOrganize>> listPage(@RequestBody OrganizeListRequest request) throws Exception {
         Page<MeterOrganize> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(organizeService.listPage(page, request)));
     }
 
+
     @ApiOperation("计量组织列表")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<List<MeterOrganize>> list(@RequestBody OrganizeListRequest request) {
+    public ReturnDTO<List<MeterOrganize>> list(@RequestBody OrganizeListRequest request) throws Exception {
         return ReturnUtil.success(organizeService.list(request));
     }
 
     @ApiOperation("计量组织导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody OrganizeListRequest request) throws IOException {
+    public void export(@RequestBody OrganizeListRequest request) throws Exception {
         super.exportExcel(MeterOrganize.class, organizeService.list(request), ExportEnum.METER_ORGANIZE_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java
index 23629ce..65c19e3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java
@@ -10,6 +10,8 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -97,32 +99,39 @@
     /**
      * 计量专业
      */
-    @ExcelProperty("专业")
-    @ApiModelProperty(value = "计量专业", dataType = "String")
+    @DictCodeField(message = "计量专业不合法", cacheName = MeterDictCode.MEASURE_MAJOR)
+    @ApiModelProperty(value = "计量专业（字典code）", dataType = "String")
     @TableField("meter_major")
     private String meterMajor;
 
+    @ExcelProperty("专业")
+    @ApiModelProperty(value = "计量专业（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String meterMajorName;
+
     /**
      * 技术职务-字典code
      */
-    @ApiModelProperty(value = "技术职务字典code", dataType = "String")
+    @ApiModelProperty(value = "技术职务（字典code）", dataType = "String")
+    @DictCodeField(message = "技术职务不合法", cacheName = MeterDictCode.TECHNOLOGY_JOB)
     @TableField("technology_job")
     private String technologyJob;
 
     @ExcelProperty("技术职务")
-    @ApiModelProperty(value = "技术职务字典value", dataType = "String")
+    @ApiModelProperty(value = "技术职务（字典value）", dataType = "String")
     @TableField(exist = false)
     private String technologyJobName;
 
     /**
      * 行政职务-字典code
      */
-    @ApiModelProperty(value = "行政职务字典code", dataType = "String")
+    @ApiModelProperty(value = "行政职务（字典code）", dataType = "String")
+    @DictCodeField(message = "行政职务不合法", cacheName = MeterDictCode.ADMINISTRATION_JOB)
     @TableField("administration_job")
     private String administrationJob;
 
     @ExcelProperty("行政职务")
-    @ApiModelProperty(value = "行政职务字典value", dataType = "String")
+    @ApiModelProperty(value = "行政职务（字典value）", dataType = "String")
     @TableField(exist = false)
     private String administrationJobName;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java
index aed3363..000e58a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java
@@ -4,7 +4,6 @@
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.OrganizeListRequest;
@@ -12,20 +11,21 @@
 import com.casic.missiles.dto.meter.ParentDeptResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.MeterDeptTypeEnum;
-import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.meter.MeterOrganizeMapper;
 import com.casic.missiles.model.meter.MeterOrganize;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IDeptService;
 import com.casic.missiles.service.meter.IMeterOrganizeService;
+import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -43,25 +43,33 @@
 public class MeterOrganizeServiceImpl extends ServiceImpl<MeterOrganizeMapper, MeterOrganize> implements IMeterOrganizeService {
     @Autowired
     private MeterOrganizeMapper organizeMapper;
-    @Resource
-    private AbstractDictService dictService;
     @Autowired
     private IDeptService deptService;
 
     @Override
-    public Page<MeterOrganize> listPage(Page<MeterOrganize> page, OrganizeListRequest request) {
+    public Page<MeterOrganize> listPage(Page<MeterOrganize> page, OrganizeListRequest request) throws Exception {
+        DictCodeUtils.validDictCode(request);
         QueryWrapper<MeterOrganize> wrapper = getWrapper(request);
         Page<MeterOrganize> organizePage = organizeMapper.selectPage(page, wrapper);
-        organizePage.getRecords().stream().forEach(result -> {
-            result.setAdministrationJobName(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB, result.getAdministrationJob()));
-            result.setTechnologyJobName(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB, result.getTechnologyJob()));
-        });
+        if(CollectionUtils.isEmpty(organizePage.getRecords())){
+            return new Page<>();
+        }
+        for (MeterOrganize record : organizePage.getRecords()) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         return organizePage;
     }
 
     @Override
-    public List<MeterOrganize> list(OrganizeListRequest request) {
+    public List<MeterOrganize> list(OrganizeListRequest request) throws Exception {
         QueryWrapper<MeterOrganize> wrapper = getWrapper(request);
+        List<MeterOrganize> meterOrganizes = organizeMapper.selectList(wrapper);
+        if(CollectionUtils.isEmpty(meterOrganizes)){
+            return new ArrayList<>();
+        }
+        for (MeterOrganize record : meterOrganizes) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         return organizeMapper.selectList(wrapper);
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java
index dd9ac4d..e5c33ae 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterOrganizeService.java
@@ -21,7 +21,7 @@
  */
 public interface IMeterOrganizeService extends IService<MeterOrganize> {
 
-    Page<MeterOrganize> listPage(Page<MeterOrganize> page, OrganizeListRequest request);
+    Page<MeterOrganize> listPage(Page<MeterOrganize> page, OrganizeListRequest request) throws Exception;
 
     int addOrganize(Dept dept);
 
@@ -31,7 +31,7 @@
 
     ReturnDTO updateOrganize(MeterOrganize meterOrganize);
 
-    List<MeterOrganize> list(OrganizeListRequest request);
+    List<MeterOrganize> list(OrganizeListRequest request) throws Exception;
 
     ParentDeptResponse deptInfo(ParentDeptRequest request);
 }