议题审核历史

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java

@@ -29,6 +29,7 @@ import com.epmet.dao.IssueApplicationHistoryDao;
 import com.epmet.dto.IssueApplicationHistoryDTO;
 import com.epmet.dto.form.ApplicationDetailWorkFormDTO;
 import com.epmet.dto.form.ApplicationHistoryWorkFormDTO;
+import com.epmet.dto.form.UserIdsFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IssueApplicationHistoryEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@@ -161,11 +162,13 @@ public class IssueApplicationHistoryServiceImpl extends BaseServiceImpl<IssueApp
             return new ArrayList<>();
         }
         List<String> userIds = result.stream().map(m -> m.getUserId()).collect(Collectors.toList());
-        Result<List<UserBaseInfoResultDTO>> listResult = epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
+        UserIdsFormDTO form = new UserIdsFormDTO();
+        form.setUserIds(userIds);
+        Result<List<StaffSinGridResultDTO>> listResult = epmetUserOpenFeignClient.getStaffInfoList(form);
         if (!listResult.success()){
             throw new RenException("议题审核历史查询用户基本信息失败......");
         }
-        result.forEach(r -> listResult.getData().stream().filter(u -> r.getUserId().equals(u.getUserId())).forEach(u -> r.setStaffName(u.getRealName())));
+        result.forEach(r -> listResult.getData().stream().filter(u -> r.getUserId().equals(u.getStaffId())).forEach(u -> r.setStaffName(u.getStaffName())));
         return result;
     }
 

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml

@@ -25,7 +25,7 @@
             iah.ID AS historyId,
             iah.ACTION_TYPE,
             UNIX_TIMESTAMP(iah.CREATED_TIME) AS operateTime,
-            iah.REASON,
+            IFNULL(iah.REASON,'') AS reason,
             iah.CREATED_BY AS userId
         FROM issue_application_history iah
         LEFT JOIN issue_application ia ON ia.ID = iah.ISSUE_APPLICATION_ID