diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml
index 85e0b29..8c5eb4f 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml
@@ -69,7 +69,7 @@
and t2.dept_id = #{request.deptId}
- and t2.major like concat('%', #{request.major}, '%')
+ and t2.major = #{request.major}
and t2.verifier_certificate_no like concat('%', #{request.verifierCertificateNo}, '%')
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml
index 85e0b29..8c5eb4f 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml
@@ -69,7 +69,7 @@
and t2.dept_id = #{request.deptId}
- and t2.major like concat('%', #{request.major}, '%')
+ and t2.major = #{request.major}
and t2.verifier_certificate_no like concat('%', #{request.verifierCertificateNo}, '%')
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
index 862fc65..82a9725 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.constants.MeterDictCode;
import com.casic.missiles.core.application.service.AbstractDictService;
import com.casic.missiles.core.base.service.IBaseExportService;
import com.casic.missiles.core.model.auth.AuthUser;
@@ -318,6 +319,7 @@
bean.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION, bean.getEducation()));
bean.setTechnologyJob(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB, bean.getTechnologyJob()));
bean.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB, bean.getAdministrationJob()));
+ bean.setMajor(dictService.getDictNameByCode(MeterDictCode.MEASURE_MAJOR, bean.getMajor()));
bean.setDeptName(deptMapper.selectById(bean.getDeptId()).getFullName());
});
return meterStaffList;