Merge branch 'refs/heads/dev-caomeihuizhang' into container-test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamCaomeiBadgeController.java

@@ -80,9 +80,6 @@ public class AdamCaomeiBadgeController extends BaseController {
             return subTitleCheck;
         }
         String trimmedName = StringUtils.trimToEmpty(param.getName());
-        if (adamCaomeiBadgeAdminService.existsOtherBadgeWithSameName(trimmedName, null)) {
-            return error("徽章名称已存在，请勿重复");
-        }
 
         AdamCaomeiBadge badge = new AdamCaomeiBadge();
         BeanUtils.copyProperties(param, badge);
@@ -174,9 +171,6 @@ public class AdamCaomeiBadgeController extends BaseController {
             return subTitleCheck;
         }
         String trimmedName = StringUtils.trimToEmpty(param.getName());
-        if (adamCaomeiBadgeAdminService.existsOtherBadgeWithSameName(trimmedName, param.getBadgeId())) {
-            return error("徽章名称已存在，请勿重复");
-        }
         if (!Objects.equals(param.getType(), oldBadge.getType())) {
             return error("徽章类型不允许修改");
         }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/caomei/badge/badge_list.html

@@ -192,7 +192,15 @@
             $.modal.msgError("未找到徽章ID");
             return;
         }
-        $.modal.open("领取用户", prefix + "/claimUsers/" + badgeId);
+        $.modal.openOptions({
+            title: "领取用户",
+            url: prefix + "/claimUsers/" + badgeId,
+            skin: 'layui-layer-gray',
+            btn: ['关闭'],
+            yes: function (index, layero) {
+                layer.close(index);
+            }
+        });
     }
 
 </script>