操作日志bug

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

@@ -442,9 +442,21 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         Long hmGroupId = hmQrcodeQDTO.getHmGroupId();
         Long hmGroupIdOld = hmOld.getHmGroupId();
         if (!hmGroupId.equals(hmGroupIdOld)) {
+            String  oldName = "默认分组";
+            if(hmGroupIdOld != 0) {
                 HmGroupSettingBO hmGroupSettingBOOld = hmGroupService.queryGroupSettingDetail(hmGroupIdOld);
+                if(null != hmGroupSettingBOOld) {
+                    oldName = hmGroupSettingBOOld.getGroupName();
+                }
+            }
+            String newName = "默认分组" ;
+            if(hmGroupId != 0) {
                 HmGroupSettingBO hmGroupSettingBO = hmGroupService.queryGroupSettingDetail(hmGroupId);
-            logContent.append("活码分组「").append(hmGroupSettingBOOld.getGroupName()).append("」").append("变更为「").append(hmGroupSettingBO.getGroupName()).append("」");
+                if(null != hmGroupSettingBO) {
+                    newName = hmGroupSettingBO.getGroupName() ;
+                }
+            }
+            logContent.append("活码分组「").append(oldName).append("」").append("变更为「").append(newName).append("」");
         }
         //员工变更
         List<String> clerkIdList = hmQrcodeQDTO.getClerkIdList();