绑定日志

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffClerkBindLogDetailDTO.java

@@ -106,11 +106,20 @@ public class StaffClerkBindLogDetailDTO implements Serializable {
      *
      */
     private Date updateTime;
+    private String operName ;
 
     /**
      */
     private static final long serialVersionUID = 1L;
 
+    public String getOperName() {
+        return operName;
+    }
+
+    public void setOperName(String operName) {
+        this.operName = operName;
+    }
+
     public String getClerkPhone() {
         return clerkPhone;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java

@@ -303,30 +303,16 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
     public Page<StaffClerkBindLogDetailDTO> pageStaffClerkBindLog(String wxEnterpriseId, String search, String enterpriseId, int optType, BasePageInfo pageInfo) {
         Page<StaffClerkBindLogDetailDTO> retList = staffClerkBindLogService.pageBindLog(wxEnterpriseId, enterpriseId, optType, search, pageInfo);
         if (CollectionUtils.isNotEmpty(retList.getResult())) {
-            retList.getResult().forEach(staffClerkBindLogDetailDTO -> {
-                TabHaobanStaff haobanStaff = staffService.selectById(staffClerkBindLogDetailDTO.getStaffId());
-                if (null != haobanStaff) {
-                    staffClerkBindLogDetailDTO.setStaffName(haobanStaff.getStaffName());
-                    staffClerkBindLogDetailDTO.setWxUserId(haobanStaff.getWxUserId());
-                } else {
-                    staffClerkBindLogDetailDTO.setStaffName("未知成员");
-                }
-                if ("-1".equals(staffClerkBindLogDetailDTO.getOptStaffId())) {
-                    staffClerkBindLogDetailDTO.setOptStaffName("系统");
-                } else {
-                    haobanStaff = staffService.selectById(staffClerkBindLogDetailDTO.getOptStaffId());
-                    if (null != haobanStaff) {
-                        staffClerkBindLogDetailDTO.setOptStaffName(haobanStaff.getStaffName());
-                    } else {
-                        staffClerkBindLogDetailDTO.setOptStaffName("未知成员");
-                    }
+            retList.getResult().forEach(item -> {
+                if ("-1".equals(item.getOptStaffId())) {
+                    item.setOptStaffName("系统");
+                }else {
+                    item.setOptStaffName(item.getOperName());
                 }
-
-                ClerkDTO clerkDTO = clerkService.getClerkByClerkIdNoStatus(staffClerkBindLogDetailDTO.getClerkId());
-                if (null != clerkDTO) {
-                    staffClerkBindLogDetailDTO.setClerkName(clerkDTO.getClerkName());
+                if(StringUtils.isBlank(item.getOptStaffName())) {
+                    item.setOptStaffName("未知成员");
                 }
-                staffClerkBindLogDetailDTO.setClerkPhoneNumber(staffClerkBindLogDetailDTO.getClerkPhone());
+                item.setClerkPhoneNumber(item.getClerkPhone());
             });
         }
         return retList;
@@ -341,8 +327,17 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
         Page<StaffClerkBindLogDetailDTO> retList = staffClerkBindLogService.pageUnBindLog(wxEnterpriseId, clerkId, enterpriseId, optType, pageInfo);
         if (CollectionUtils.isNotEmpty(retList.getResult())) {
             retList.getResult().forEach(item -> {
+                TabHaobanStaff haobanStaff = staffService.selectById(item.getStaffId());
+                if (null != haobanStaff) {
+                    item.setStaffName(haobanStaff.getStaffName());
+                    item.setWxUserId(haobanStaff.getWxUserId());
+                } else {
+                    item.setStaffName("未知成员");
+                }
                 if ("-1".equals(item.getOptStaffId())) {
                     item.setOptStaffName("系统");
+                }else {
+                    item.setOptStaffName(item.getOperName());
                 }
                 if(StringUtils.isBlank(item.getOptStaffName())) {
                     item.setOptStaffName("未知成员");