1.接口同步

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantActivationCodeServiceImpl.java

@@ -302,6 +302,12 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
         TenantAlbumPurchase tenantAlbumPurchase = new TenantAlbumPurchase();
         tenantAlbumPurchase.setId(code.getTenantAlbumPurchaseId());
         tenantAlbumPurchase.setActiveQuantity(activeCodeNumber);
+
+        if (activeCodeNumber.equals(tenantAlbumPurchase.getPurchaseQuantity())) {
+            tenantAlbumPurchase.setActiveStatus("ALL");
+        } else {
+            tenantAlbumPurchase.setActiveStatus("PART");
+        }
         tenantAlbumPurchaseMapper.updateById(tenantAlbumPurchase);
 
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantGroupServiceImpl.java

@@ -115,7 +115,9 @@ public class TenantGroupServiceImpl extends ServiceImpl<TenantGroupMapper, Tenan
             for (TenantGroupWrapper.TenantGroup record : records) {
                 record.setGroupUserCount(groupBy.getOrDefault(record.getId(), 0));
                 record.setImGroupExist(existImgGroupIds.contains(record.getImGroupId()));
-                record.setAdminName(mapByIds.get(record.getAdminId()).getUsername());
+                if (mapByIds.containsKey(record.getAdminId())) {
+                    record.setAdminName(mapByIds.get(record.getAdminId()).getUsername());
+                }
             }
         }
         return iPage;