From 7ffe7b1791adfc27f4411c7ad0bea229f6799445 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 04 Mar 2024 12:00:13 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml | 4 +
src/main/java/org/springblade/modules/property/vo/PropertyCompanyDistrictVO.java | 10 ++++-
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 4 ++
src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java | 2
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 76 ++++++++++++++++++--------------------
5 files changed, 52 insertions(+), 44 deletions(-)
diff --git a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
index be346dd..e67e886 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -41,30 +41,28 @@
<sql id="selectArticle">
- select
- id,
- title,
- type,
- content,
- url,
- video_url,
- source_id,
- source_name,
- article_type,
- recommend,
- publish,
- iscomment,
- view_number,
- create_time,
- update_time,
- update_user,
- create_user,
- is_deleted,
- article_range,
- building,
- unit
- from
- jczz_article
+ select id,
+ title,
+ type,
+ content,
+ url,
+ video_url,
+ source_id,
+ source_name,
+ article_type,
+ recommend,
+ publish,
+ iscomment,
+ view_number,
+ create_time,
+ update_time,
+ update_user,
+ create_user,
+ is_deleted,
+ article_range,
+ building,
+ unit
+ from jczz_article
</sql>
@@ -113,12 +111,12 @@
<if test="article.districtId != null and article.districtId != ''">
and (ja.article_range like concat('%',#{article.districtId},'%')
- or ja.article_range is null or ja.article_range = '')
+ or ja.article_range is null or ja.article_range = '')
</if>
<if test="article.userId != null">
and (jpd.user_ids like concat('%',#{article.userId},'%')
- OR jpd.user_ids IS NULL or jpd.user_ids = '')
+ OR jpd.user_ids IS NULL or jpd.user_ids = '')
</if>
<if test="article.building != null and article.building != ''">
@@ -198,16 +196,13 @@
LEFT JOIN blade_region br on br.`code` = jd.community_code
where 1=1
and ja.is_deleted = 0
- <if test="article.propertyFlag!=null ">
- <if test="article.communityName!=null and article.communityName!=''">
- and br.`village_name` like concat('%',#{article.communityName},'%')
- </if>
-
- <if test="article.streetName!=null and article.streetName!=''">
- and br.town_name like concat('%',#{article.streetName},'%')
- </if>
+ <if test="article.communityName!=null and article.communityName!=''">
+ and br.`village_name` like concat('%',#{article.communityName},'%')
</if>
+ <if test="article.streetName!=null and article.streetName!=''">
+ and br.town_name like concat('%',#{article.streetName},'%')
+ </if>
<if test="article.title!=null and article.title!=''">
and ja.title like concat('%',#{article.title},'%')
@@ -238,10 +233,10 @@
<foreach collection="article.districtIdList" separator=" or article_range like" item="id">'%${id}%'
</foreach>
)
-<!-- and ja.district_id in-->
-<!-- <foreach collection="article.districtIdList" index="index" item="item" open="(" separator="," close=")">-->
-<!-- #{item}-->
-<!-- </foreach>-->
+ <!-- and ja.district_id in-->
+ <!-- <foreach collection="article.districtIdList" index="index" item="item" open="(" separator="," close=")">-->
+ <!-- #{item}-->
+ <!-- </foreach>-->
</if>
order by ja.create_time desc
</select>
@@ -444,8 +439,9 @@
</select>
<update id="upcomment">
- update jczz_article set iscomment = #{type}
- where id in(${ids})
+ update jczz_article
+ set iscomment = #{type}
+ where id in (${ids})
</update>
<!--个人资讯-->
diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java
index d66dea5..4d7c71e 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java
@@ -59,7 +59,7 @@
@ApiModelProperty(value = "小区id")
private String districtId;
/**
- * 负责人姓名
+ * 负责人id
*/
@ApiModelProperty(value = "负责人id")
private String principal;
diff --git a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
index c89f520..04d732d 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
@@ -33,7 +33,8 @@
jpc.name as propertyCompanyName,
br.name communityName,
br.name streetName,
- jg.grid_name
+ jg.grid_name,
+ bu.name principalName
FROM
jczz_property_company_district jpcd
LEFT JOIN jczz_district jd ON jd.id = jpcd.district_id AND jd.is_deleted = 0
@@ -41,6 +42,7 @@
LEFT JOIN blade_region br on br.code= jd.community_code
LEFT JOIN jczz_grid_range jgr on jgr.district_code=jd.id
LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id
+ LEFT JOIN blade_user bu on bu.id = jpcd.principal
where jpcd.is_deleted = 0
<if test="propertyCompanyDistrict.communityName!=null and propertyCompanyDistrict.communityName!=''">
and br.name like concat('%', #{propertyCompanyDistrict.communityName},'%')
diff --git a/src/main/java/org/springblade/modules/property/vo/PropertyCompanyDistrictVO.java b/src/main/java/org/springblade/modules/property/vo/PropertyCompanyDistrictVO.java
index ac3df0f..db2581d 100644
--- a/src/main/java/org/springblade/modules/property/vo/PropertyCompanyDistrictVO.java
+++ b/src/main/java/org/springblade/modules/property/vo/PropertyCompanyDistrictVO.java
@@ -16,10 +16,10 @@
*/
package org.springblade.modules.property.vo;
-import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
-import org.springblade.core.tool.node.INode;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
import java.util.List;
@@ -57,5 +57,11 @@
// 机构
private String deptId;
+ /**
+ * 负责人名称
+ */
+ @ApiModelProperty(value = "负责人名称")
+ private String principalName;
+
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 259c52c..aa6c93c 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -24,6 +24,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
import org.springblade.common.cache.DictCache;
@@ -640,6 +641,9 @@
@Override
public List<User> getUserInfoByPropertyId(String propertyCompanyId, String roleId) {
// 查询物业公司，获取物业公司的机构
+ if(StringUtils.isBlank(propertyCompanyId)){
+ return new ArrayList<>();
+ }
IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getId, propertyCompanyId));
return baseMapper.getUserInfoByPropertyId(one.getDeptId().toString(), roleId);
--
Gitblit v1.9.3