yp 3 rokov pred
rodič
commit
65726fdad2

+ 9 - 7
wxdks/src/main/java/com/c3/wxdks/service/impl/OrgInfoServiceImpl.java

@@ -196,13 +196,15 @@ public class OrgInfoServiceImpl implements OrgInfoService {
             if (Blank.isNotEmpty(orgInfo)) {
                 String classificationExplain = Convert.toStr(orgInfo.get("classificationExplain"));
                 HashMap map = JSON.parseObject(classificationExplain, HashMap.class);
-                for (Object keyName : map.keySet()) {
-                    Map<String, Object> otherMap = new HashMap<>();
-                    Map<String, Object> fatInfo = tDictMapper.getFatherInfoById(Convert.toInt(keyName));
-                    if (Blank.isNotEmpty(fatInfo)) {
-                        otherMap.put("otherDes", map.get(keyName));
-                        otherMap.put("beforeName", fatInfo.get("dictValue"));
-                        otherCls.add(otherMap);
+                if (Blank.isNotEmpty(map)) {
+                    for (Object keyName : map.keySet()) {
+                        Map<String, Object> otherMap = new HashMap<>();
+                        Map<String, Object> fatInfo = tDictMapper.getFatherInfoById(Convert.toInt(keyName));
+                        if (Blank.isNotEmpty(fatInfo)) {
+                            otherMap.put("otherDes", map.get(keyName));
+                            otherMap.put("beforeName", fatInfo.get("dictValue"));
+                            otherCls.add(otherMap);
+                        }
                     }
                 }
             }

+ 5 - 16
wxdks/src/main/resources/static/page/js/basic/companyManage.js

@@ -129,7 +129,7 @@ function initCompanyPage(){
     form.on('submit(submit)', function (data){
         var data = form.val('dataForm');
         var objs = $("input[name='otherClass']") //选择所有的name属性等于'otherClass'的input元素
-        // console.log(objs)
+        console.log(objs)
         var otherData = {};
         if (objs && objs.length > 0) {
             for (var i = 0; i < objs.length; i++){
@@ -296,21 +296,10 @@ function echoClassification(data) {
             $("#classificationOther").append(str)
             form.render()
         }
-        // var beforeName = arr[i].__node.parent.name;
-        // var otherId = arr[i].value;
-        // var str = '';
-        // if (arr[i].name === '其他') {
-        //     str += '<div class="layui-form-item"><label class="layui-form-label">'+beforeName+':</label>' +
-        //         '<div class="layui-input-block"><input type="text" data-id="'+otherId+'" name="otherClass" id= "otherClass"'+i+' ' +
-        //         'maxlength="500" class="layui-input" ' +
-        //         'placeholder="'+ beforeName +'" autocomplete="off"></div></div>';
-        // }
-        // $("#classificationOther").append(str)
-        // form.render()
     }
-    // if (json.data.columnExplain) {
-    //     $("#columnShow").show();
-    // }
+    if (data.columnExplain) {
+        $("#columnShow").show();
+    }
 }
 function initColumn(){
     ly.ajax({
@@ -795,7 +784,7 @@ function xmSelectRender(data, vAttr, kAttr){
                     var str = '';
                     if (arr[i].name === '其他') {
                         str += '<div class="layui-form-item"><label class="layui-form-label">'+beforeName+':</label>' +
-                            '<div class="layui-input-block"><input type="text" data-id="'+otherId+'" name="otherClass" id= "otherClass"'+i+' ' +
+                            '<div class="layui-input-block"><input type="text" data-id="'+otherId+'" name="otherClass"' +
                             'maxlength="500" class="layui-input" ' +
                             'placeholder="'+ beforeName +'" autocomplete="off"></div></div>';
                     }