From d4652968511bc92854d87e9519f144512743fd05 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 13:28:03 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/discuss/mapper/UserPublicEnrollMapper.xml | 3 +++
src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml | 5 +++--
src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml | 1 +
src/main/java/org/springblade/flow/listener/MyExecutionListener.java | 5 +++++
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/flow/listener/MyExecutionListener.java b/src/main/java/org/springblade/flow/listener/MyExecutionListener.java
index 088b7e1..997dbe7 100644
--- a/src/main/java/org/springblade/flow/listener/MyExecutionListener.java
+++ b/src/main/java/org/springblade/flow/listener/MyExecutionListener.java
@@ -14,6 +14,9 @@
System.out.println("***************************DelegateExecution");
IPropertyCapitalApplyService bean = SpringUtils.getBean(IPropertyCapitalApplyService.class);
PropertyCapitalApplyEntity applyEntity = bean.getOne(Wrappers.<PropertyCapitalApplyEntity>lambdaQuery().eq(PropertyCapitalApplyEntity::getProcessInstanceId, delegateExecution.getProcessInstanceId()));
+ if (applyEntity == null) {
+ return;
+ }
if (delegateExecution.getCurrentActivityId().equals("ownersCommittee1")) {
applyEntity.setApplyStatus(1);
} else if (delegateExecution.getCurrentActivityId().equals("ownersCommitteePass")) {
@@ -26,6 +29,8 @@
applyEntity.setApplyStatus(5);
} else if (delegateExecution.getCurrentActivityId().equals("applyNotPass")) {
applyEntity.setApplyStatus(6);
+ } else if (delegateExecution.getCurrentActivityId().equals("ownersCommitteeFlag0")) {
+ applyEntity.setApplyStatus(2);
}
bean.updateById(applyEntity);
}
diff --git a/src/main/java/org/springblade/modules/discuss/mapper/UserPublicEnrollMapper.xml b/src/main/java/org/springblade/modules/discuss/mapper/UserPublicEnrollMapper.xml
index 94676e8..a0646c9 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserPublicEnrollMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserPublicEnrollMapper.xml
@@ -34,6 +34,7 @@
jup.create_time,
jup.update_time,
jup.deleted_flag,
+ jup.signature_path,
bu.avatar,
bu.`name`,
bu.phone,
@@ -42,7 +43,9 @@
FROM
jczz_user_public_enroll jup
LEFT JOIN blade_user bu ON jup.user_id = bu.id
+ AND bu.is_deleted = 0
LEFT JOIN jczz_household jh ON jh.associated_user_id = jup.user_id
+ AND jh.is_deleted = 0
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
<where>
<if test="userPublicEnroll.id != null "> and jup.id = #{userPublicEnroll.id}</if>
diff --git a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
index 105af85..d8070e0 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
@@ -32,6 +32,7 @@
<select id="selectUserTopicsPage" resultMap="userTopicsResultMap">
SELECT
jut.article_id,
+ jut.signature_path,
bu.avatar,
bu.`name`,
bu.phone,
@@ -39,8 +40,8 @@
jda.aoi_name
FROM
jczz_user_topics as jut
- LEFT JOIN blade_user bu ON jut.user_id = bu.id
- LEFT JOIN jczz_household jh ON jh.associated_user_id = jut.user_id
+ LEFT JOIN blade_user bu ON jut.user_id = bu.id AND bu.is_deleted = 0
+ LEFT JOIN jczz_household jh ON jh.associated_user_id = jut.user_id AND jh.is_deleted = 0
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
<where>
<if test="userTopics.id != null ">and jut.id = #{userTopics.id}</if>
diff --git a/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml b/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml
index abee737..64d6feb 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml
@@ -56,6 +56,7 @@
<if test="propertyCapitalApply.regionCode != null and propertyCapitalApply.regionCode !='' ">
and jd.community_code like concat('%',#{propertyCapitalApply.regionCode},'%')
</if>
+ order by jpca.create_time desc
</select>
--
Gitblit v1.9.3