2 Commits 4f54d431cb ... a0e8aae042

Author SHA1 Message Date
  da-xian a0e8aae042 Merge remote-tracking branch 'origin/master' 4 months ago
  da-xian 19ffaed665 组织树 4 months ago

+ 4 - 2
src/main/resources/mapping/cquery/CdOrganizationCQuery.xml

@@ -17,7 +17,9 @@
     </select>
 
     <select id="getListToTree2" resultType="com.bowintek.smartsearch.vo.cd.CdOrganizationTreeVo">
-        select id as value, name as label, parent_id as parentValue
-        from by_dwr.org_202411new order by name
+        select id_new as value, new_org as label, pid_new as parentValue
+        from by_dwr.org_20241126
+        where id_new != pid_new or pid_new is null
+        order by sort
     </select>
 </mapper>

+ 1 - 1
vue/src/views/wellinfo/index.vue

@@ -1198,7 +1198,7 @@ export default defineComponent({
   padding: 5px;
   padding-top: 10px;
   overflow-y: scroll;
-  height: 100%;
+  max-height: 500px;
 }
 
 .col-text {