diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
index 4d75cdc8..4b2579e2 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
@@ -251,13 +251,15 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
             LeaseApplyInfo leaseApplyInfo = new LeaseApplyInfo();
             leaseApplyInfo.setId(bean.getId());
             Long userId = SecurityUtils.getLoginUser().getUserid();
-            leaseApplyInfo.setUserId(userId);
+            //leaseApplyInfo.setUserId(userId);
             LeaseApplyInfo info = leaseApplyInfoMapper.getLeaseInfoById(leaseApplyInfo);
             if (StringUtils.isNotBlank(bean.getPublishTask())) {
                 leaseApplyInfo.setPublishTask(bean.getPublishTask());
                 List<LeaseApplyInfo> leaseApplyOutList = leaseApplyInfoMapper.selectPublishList(leaseApplyInfo);
                 if (!CollectionUtils.isEmpty(leaseApplyOutList)) {
                     info = leaseApplyOutList.get(0);
+                    info.setUnitName(info.getLeaseUnit());
+                    info.setProjectName(info.getLeaseProject());
                 }
             }
             LeaseApplyRequestVo leaseApplyRequestVo = new LeaseApplyRequestVo();
@@ -684,8 +686,8 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
      */
     private boolean containsKeyword(LeaseApplyInfo item, String keyWord) {
         return (item.getMaTypeNames() != null && item.getMaTypeNames().contains(keyWord)) ||
-                (item.getUnitName() != null && item.getUnitName().contains(keyWord)) ||
-                (item.getProjectName() != null && item.getProjectName().contains(keyWord)) ||
+                (item.getLeaseUnit() != null && item.getLeaseUnit().contains(keyWord)) ||
+                (item.getLeaseProject() != null && item.getLeaseProject().contains(keyWord)) ||
                 (item.getCode() != null && item.getCode().contains(keyWord)) ||
                 (item.getCreateBy() != null && item.getCreateBy().contains(keyWord)) ||
                 (item.getLeasePerson() != null && item.getLeasePerson().contains(keyWord)) ||
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
index 8a89935f..ff122342 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
@@ -717,7 +717,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         bu.unit_name AS unitName,
         bp.pro_name AS projectName,
         bai.agreement_code AS agreementCode,
-        IFNULL( lad.num, 0) AS preCountNum,
+        IFNULL(SUM(lpd.num), 0) AS preCountNum,
         IFNULL(lod.num, 0) AS alNum,
         GROUP_CONCAT( DISTINCT mt1.type_name ) AS maTypeNames,
         lpd.publish_task AS publishTask,
@@ -733,9 +733,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         bp.external_id as externalId
         FROM
         lease_apply_info lai
-        LEFT JOIN (SELECT parent_id, SUM(pre_num) as num FROM lease_apply_details GROUP BY parent_id) lad  ON lai.id = lad.parent_id
         LEFT JOIN tm_task tt ON lai.task_id = tt.task_id
-        LEFT JOIN lease_publish_details lpd ON lai.id = lpd.parent_id
+        LEFT JOIN lease_publish_details lpd ON lpd.parent_id = lai.id
         LEFT JOIN (SELECT IFNULL( sum(out_num ), 0) AS num, parent_id, publish_task, is_confirm, confirm_remark, confirm_time, lease_sign_id from lease_out_details
         GROUP BY parent_id) lod ON lpd.parent_id = lod.parent_id
         LEFT JOIN bm_unit bu ON bu.unit_id = lpd.unit_id