# 更新

cost-service/src/main/java/com/blt/other/module/cost/service/impl/CostApiServiceImpl.java

@@ -279,6 +279,8 @@ public class CostApiServiceImpl implements CostApiService {
     @Override
     public List<ManageCostDto> manageCostList(ManageCostListReq req) {
         List<CostDomain> manageCostList = costDao.manageCostList(req);
+        costService.setPrimaryDepartment(manageCostList);
+
         return manageCostList.stream()
                 .map(costDomain -> {
                     ManageCostDto manageCostDto = new ManageCostDto();
@@ -299,8 +301,9 @@ public class CostApiServiceImpl implements CostApiService {
                     manageCostDto.setReceiveUnit(costDomain.getBankCompany());
 
                     manageCostDto.setPayTime(costDomain.getPayTime());
-
                     manageCostDto.setFeeSuperType(costDomain.getTypeName());
+
+                    manageCostDto.setDepartmentName(costDomain.getPrimaryDepartmentName());
                     return manageCostDto;
                 })
                 .collect(Collectors.toList());

cost-service/src/main/resources/mapper/Cost.xml

@@ -326,12 +326,12 @@
     </select>
 
     <select id="manageCostList" resultType="com.blt.other.module.cost.model.CostDomain">
-        select *
+        select t1.*
         from cost t1
                  left join cost_type ct on t1.type_id = ct.id
         where t1.cost_status = 4
           and ct.is_manage_cost = 1
-          and last_modify_date between #{startDateStr} and #{endDateStr}
+          and t1.last_modify_date between #{startDateStr} and #{endDateStr}
     </select>
 
 </mapper>