需要在查询条件、列表列及详情页中显示该字段（显示承包商类别）；

岗位创建完成后排序顺序混乱，既不是创建先后顺序也不是职级前后顺序。

根据创建时间倒序排序

获取首页地图统计

等bug需求修改

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/ZLOA/sysUserOA/controller/TSysLoginController.java

@@ -668,11 +668,28 @@ public class TSysLoginController extends SuperController {
         List<DeptAndPost> deptAndPosts = new ArrayList();
         Iterator var11 = records.iterator();
 
-        while (var11.hasNext()) {
+        /*while (var11.hasNext()) {
             SysOrg record = (SysOrg) var11.next();
             DeptAndPost deptAndPost = (DeptAndPost) BeanHelper.beanToBean(record, DeptAndPost.class);
             String orgId = deptAndPost.getOrgId();
             List<TSysPost> list = this.tSysPostService.list((Wrapper) ((QueryWrapper) (new QueryWrapper()).eq("dept_id", orgId)).ne("status", "1"));
+            deptAndPost.setTSysPosts(list);
+            deptAndPosts.add(deptAndPost);
+        }*/
+
+        while (var11.hasNext()) {
+            SysOrg record = (SysOrg) var11.next();
+            DeptAndPost deptAndPost = BeanHelper.beanToBean(record, DeptAndPost.class);
+            String orgId = deptAndPost.getOrgId();
+
+            // 使用旧版排序方式
+            List<TSysPost> list = this.tSysPostService.list(
+                    new QueryWrapper<TSysPost>()
+                            .eq("dept_id", orgId)
+                            .ne("status", "1")
+                            .orderBy(true, false, "create_date")  // 降序排序
+            );
+
             deptAndPost.setTSysPosts(list);
             deptAndPosts.add(deptAndPost);
         }

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/contractor/ledger/model/template/PersonTemplate.java

@@ -2,6 +2,7 @@ package com.testor.module.contractor.ledger.model.template;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.NumberFormat;
 import com.testor.common.annotation.ExcelDictFormat;
 import com.testor.common.annotation.ExcelSelected;
 import com.testor.common.constant.ExcelSelectConstant;

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/contractor/manage/model/dto/ContractorInfoDTO.java

@@ -69,4 +69,10 @@ public class ContractorInfoDTO extends TContractorBasicInfo {
   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   private Date validPeriod;
 
+  /**
+   * 承包商类型
+   */
+  @ApiModelProperty(value = "承包商类型")
+  private String type;
+
 }

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/contractor/manage/model/dto/TContractorBasicInfoParam.java

@@ -50,5 +50,8 @@ public class TContractorBasicInfoParam extends TContractorBasicInfo {
 	@ApiModelProperty(value = "待办任务id")
 	private String taskId;
 
+	@ApiModelProperty(value = "承包商类别")
+	private String type;
+
 	private Map<String, Object> map;
 }

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/lease/controller/TLeaseBankController.java

@@ -92,11 +92,13 @@ public class TLeaseBankController extends SuperController {
 
         if (StringHelper.isEmpty(orgId)) {
             // 当前登录用户的组织机构id
-            orgId = ContextUtils.getLoginUser().getOrgId();
+            //orgId = ContextUtils.getLoginUser().getOrgId();
+            //不传取所有
+            orgId = "32cdbb3a278944f1a83ca40dbcc93c0a";
         }
         // 获取当前的子机构
         List<SysOrg> orgList = sysOrgService.list(new QueryWrapper<SysOrg>()
-                .eq(SysOrg.PARENT_ID, orgId)
+                .like(SysOrg.PARENT_IDS, orgId)
                 .eq(SysOrg.IS_DEPT, "0")
                 .ne(SysOrg.STATUS, BizConstants.STATUS_DELETE)
         );

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorBasicInfo.xml

@@ -56,7 +56,8 @@
         tci.addr,
         tci.reg_date,
         tci.valid_period,
-        tcbi.process_status
+        tcbi.process_status,
+        tcl.type type
         FROM
         t_contractor_basic_info AS tcbi
         LEFT JOIN t_contractor_ledger_project AS tclp ON tcbi.id = tclp.biz_id
@@ -73,6 +74,9 @@
             AND to_char(tci.valid_period,'yyyy-mm-dd') >= to_char(#{param.validityStartDate}::DATE,'yyyy-mm-dd')
             AND to_char(tci.valid_period,'yyyy-mm-dd') <= to_char(#{param.validityEndDate}::DATE,'yyyy-mm-dd')
         </if>
+        <if test="param.type != null and param.type != ''">
+            AND tcl.type =#{param.type}
+        </if>
         GROUP BY
         tcbi.id,
         tcl.id,