Merge branch 'pre' into 'master'

选择组bug

See merge request !204

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userPendingList/detail.html

@@ -37,7 +37,7 @@
 <div class="detail_inner detail_mobail"></div>
 <p>提交时间：</p>
 <div class="detail_inner detail_created"></div>
-<div class="bottomBtn" id = "btn-commit">
+<div class="bottomBtn" id="btn-commit">
     <a href="javascript:" class="a-success layui-layer-btn0" onclick="yes(1)">通过</a>
     <a class="layui-layer-btn1 layui-layer-btn1 a-fail" onclick="closeModal(0)">驳回</a>
 </div>
@@ -123,7 +123,7 @@
             $('.detail_mobail').text(detailData.phone);
             $('.detail_created').text(detailData.createdDate);
             if (detailData.type != 0) {
-                document.getElementById("btn-commit").style.visibility="hidden";
+                document.getElementById("btn-commit").style.visibility = "hidden";
             }
         }
     })
@@ -141,7 +141,7 @@
         if (num == 1) {
             var postData = {
                 id: Number(detailObj.id),
-                orgId: Number(detailObj.id),
+                orgId: Number(detailObj.orgId),
                 type: Number(detailObj.type),
                 uid: detailObj.uid,
             }
@@ -186,6 +186,8 @@
                         data: JSON.stringify(postData),
                         success: function (res) {
                             $('#selectTwo').html('');
+
+                            $('#selectTwo').append('<option value="0">请选择</option>');
                             for (var i in res.rows) {
                                 $('#selectTwo').append('<option value="' + res.rows[i].id + '">' + res.rows[i].name + '</option>');
                             }