'commit'

FengHuang/WebRoot/html/pages/dep/add.html

@@ -45,10 +45,8 @@
                 <span class="we-red">*</span>部门类型：
             </label>
             <div class="layui-input-inline textinput">
-                <select name="orgType" lay-verify="required">
+                <select name="orgType" lay-verify="required" id="orgType">
-                    <option value="0">部门</option>
+
-                    <option value="1">院系</option>
-                    <option value="2">专业</option>
                 </select>
             </div>
         </div>
@@ -81,7 +79,31 @@
             layer = layui.layer;
         var area_id="";
         var level_id="";
-        var org_id=GetQueryString("org_id");
+        var org_id = GetQueryString("org_id");
+        var parent_id = GetQueryString("parent_id");
+        var org_type_id = GetQueryString("org_type");
+        var school_type_id = GetQueryString("school_type");
+
+        if(school_type_id != "361" && school_type_id != "451")
+        {
+            console.log(school_type_id);
+            $('#orgType').append(`
+                    <option value="0">部门</option>
+                `)
+            form.render();
+        }else{
+            console.log("222222222");
+            $('#orgType').append(`
+                    <option value="0">部门</option>
+                    <option value="1">院系</option>
+                    <option value="2">专业</option>
+                `)
+            form.render();
+        }
+
+
+
+
 
         $("#name").focus();
         verifyLength();

FengHuang/WebRoot/html/pages/dep/depList.html

@@ -135,7 +135,10 @@
             var btn = $("#addBtn_" + treeNode.tId);
             if (btn)
                 btn.bind("click", function () {
-                    WeAdminShow('添加', '../dep/add.html?org_id=' + treeNode.org_id+'&parent_id='+treeNode.parent_id+'&org_type='+treeNode.department_type_id, 550, 285);
+                    console.log("============");
+                    console.log(treeNode);
+                    console.log("============");
+                    WeAdminShow('添加', '../dep/add.html?org_id=' + treeNode.org_id+'&parent_id='+treeNode.parent_id+'&org_type='+treeNode.department_type_id+'&school_type='+treeNode.school_type_id, 550, 285);
                 });
         }
 

FengHuang/target/classes/Sql/organization.sql

@@ -84,11 +84,15 @@
 
   -- 组织机构部门树
   #sql("getOrgTreeByBureauId")
+<<<<<<< HEAD
 <<<<<<< HEAD
     select org_id,org_name,(case when bureau_id=org_id then '-1' else parent_id end) as parent_id,bureau_id,school_type_id,department_type_id from t_base_organization where bureau_id=?
 =======
     select org_id,org_name,(case when bureau_id=org_id then '-1' else parent_id end) as parent_id,bureau_id,department_type_id from t_base_organization where bureau_id=?
 >>>>>>> 32b4533146dc66248f1e7fdf81fe41bff017b94c
+=======
+    select org_id,org_name,(case when bureau_id=org_id then '-1' else parent_id end) as parent_id,bureau_id,school_type_id,department_type_id from t_base_organization where bureau_id=?
+>>>>>>> c1b567521dc3952024a8dff25a3cd953d8e7ce2a
       and b_use=1 order by sort_id,update_ts
   #end