diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java
index 969714b6..3f176a24 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java
@@ -320,7 +320,7 @@ public class XzdProjectBo extends BaseEntity {
/**
* 项目备案经理
*/
- private String xmbajl;
+ private Long xmbajl;
/**
* 分页大小
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java
index 9e06be97..922b4f6c 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java
@@ -242,7 +242,7 @@ public class XzdContractDetailsVo implements Serializable {
/**
* 签约组织名称
*/
- @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "signingOrganization")
+ @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "signingOrganization")
private String signingOrganizationName;
/**
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdProjectMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdProjectMapper.xml
index 78c26685..e67ee2c2 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdProjectMapper.xml
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdProjectMapper.xml
@@ -8,6 +8,7 @@
SELECT
project.id,
project.city_code as cityCode,
+ project.shzt as shzt,
project.project_attribute as projectAttribute,
project.project_number as projectNumber,
project.project_name as projectName,
@@ -42,7 +43,7 @@
LEFT JOIN xzd_project_profile as profile ON project.id = profile.xzd_project_id
# LEFT JOIN sys_user as user ON project.manager_execution = user.user_id
-# LEFT JOIN sys_user as user2 ON project.filing_manager = user2.user_id
+# LEFT JOIN xzd_project_manager_approval as approval3 ON project.filing_manager = approval3.id
LEFT JOIN sys_user as user3 ON project.create_by = user3.user_id
LEFT JOIN xzd_project_type as type ON project.project_type = type.id
LEFT JOIN xzd_project_manager_approval as approval1 ON project.filing_manager = approval1.id
@@ -87,7 +88,7 @@
- AND user2.nick_name = #{xmbajl}
+ AND approval1.id = #{xmbajl}
@@ -96,6 +97,8 @@
+ order by project.create_time desc
+
LIMIT #{pageSize} OFFSET #{offset}
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml
index 5a4fed96..ba3b032c 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml
@@ -11,6 +11,7 @@
# settlement.opening_bank as khyh,
# settlement.account_number as khhzh,
info.city_code as cityCode,
+ info.shzt as shzt,
bank.open_bank as khyh,
bank.account as khhzh,
supplement.creator as createByUser,