Merge branch 'bugfix/2023-04-21' into 'master'

Bugfix/2023 04 21

See merge request !1204

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

@@ -98,12 +98,17 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
             clerkName = clerkDTO.getClerkName();
         }
         String operClerkId = infoDTO.getOptStaffId();
-        //操作人只有staffId,operName字段存储成员名称
-        TabHaobanStaff tabHaobanStaff = staffService.selectById(operClerkId);
-//        clerkDTO = clerkService.getClerkByClerkIdNoStatus(clerkRelation.getClerkId());
+        ClerkDTO operClerkDTO = clerkService.getClerkByClerkIdNoStatus(operClerkId);
         String operName = null;
-        if (null != tabHaobanStaff) {
-            operName = tabHaobanStaff.getStaffName();
+        if (null != operClerkDTO) {
+            operName = operClerkDTO.getClerkName();
+        }
+        //如果是小程序解绑，需要存储staffName
+        if(infoDTO.getChannelCode() != null &&(infoDTO.getChannelCode().equals(ChannelCodeEnum.SELF_UNBIND.getCode()) || infoDTO.getChannelCode().equals(ChannelCodeEnum.SELF_BIND.getCode()))){
+            TabHaobanStaff tabHaobanStaff = staffService.selectById(operClerkId);
+            if (null != tabHaobanStaff) {
+                operName =tabHaobanStaff.getStaffName();
+            }
         }
         TabHaobanStaffClerkBindLog enity = new TabHaobanStaffClerkBindLog();
         enity.setClerkId(clerkRelation.getClerkId());