From c14ee9c2d4b20efc5c2522be8b113db9ce6199a0 Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Fri, 7 Oct 2022 18:32:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=A7=84=E5=88=99=E7=9A=84?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/codeRule/businessDataCodeRuleConfig.js | 24 +++++++++++--------
 .../codeRule/businessDataCodeRuleConfig.html  | 21 +++++++++++-----
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/common/src/main/resources/template/js/codeRule/businessDataCodeRuleConfig.js b/common/src/main/resources/template/js/codeRule/businessDataCodeRuleConfig.js
index 0d940c53c..9053d978b 100644
--- a/common/src/main/resources/template/js/codeRule/businessDataCodeRuleConfig.js
+++ b/common/src/main/resources/template/js/codeRule/businessDataCodeRuleConfig.js
@@ -24,18 +24,22 @@ layui.config({
 		method: "GET",
 		template: $("#baseTemplate").html(),
 		ajaxSendLoadBefore: function (hdb, json) {
-			$.each(json.bean, function (key, value) {
-				$.each(value, function (i, item) {
-					item.selectHtml = codeRuleSelectHtml;
-				})
-			})
+			$.each(json.bean, function (key, appIdValue) {
+				$.each(appIdValue, function (i, groupNameValue) {
+					$.each(groupNameValue, function (j, bean) {
+						bean.selectHtml = codeRuleSelectHtml;
+					});
+				});
+			});
 		},
 		ajaxSendAfter: function (json) {
-			$.each(json.bean, function (key, value) {
-				$.each(value, function (i, item) {
-					$("#" + item.id).val(item.codeRuleId);
-				})
-			})
+			$.each(json.bean, function (key, appIdValue) {
+				$.each(appIdValue, function (i, groupNameValue) {
+					$.each(groupNameValue, function (j, bean) {
+						$("#" + bean.id).val(bean.codeRuleId);
+					})
+				});
+			});
 
 			form.render();
 			form.on('select(codeRole)', function(data) {
diff --git a/common/src/main/resources/template/tpl/codeRule/businessDataCodeRuleConfig.html b/common/src/main/resources/template/tpl/codeRule/businessDataCodeRuleConfig.html
index e94c11118..a21cffab1 100644
--- a/common/src/main/resources/template/tpl/codeRule/businessDataCodeRuleConfig.html
+++ b/common/src/main/resources/template/tpl/codeRule/businessDataCodeRuleConfig.html
@@ -21,12 +21,21 @@
                     <div class="layui-card-header"><b>{{@key}}</b></div>
                     <div class="layui-card-body" style="display: inline-block;">
                         {{#each @this}}
-                            <blockquote class="layui-elem-quote layui-quote-nm layui-col-md2">
-                                {{serviceName}}
-                                <select lay-filter="codeRole" lay-search="" id="{{id}}" win-verify="required">
-                                    {{{selectHtml}}}
-                                </select>
-                            </blockquote>
+                            <div class="layui-col-md12">
+                                <div class="layui-card">
+                                    <div class="layui-card-header"><b>{{@key}}</b></div>
+                                    <div class="layui-card-body" style="display: flow-root;">
+                                        {{#each @this}}
+                                        <blockquote class="layui-elem-quote layui-quote-nm layui-col-md2">
+                                            {{serviceName}}
+                                            <select lay-filter="codeRole" lay-search="" id="{{id}}" win-verify="required">
+                                                {{{selectHtml}}}
+                                            </select>
+                                        </blockquote>
+                                        {{/each}}
+                                    </div>
+                                </div>
+                            </div>
                         {{/each}}
                     </div>
                 </div>
-- 
GitLab