From adcff04c70567f4b1e74ec2c8dcecbb5164f94ec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Sep 2022 09:43:35 +0800
Subject: [PATCH] 1、增加轮播图维护 2、修复队伍接口报错
---
src/main/java/org/springblade/common/config/BladeConfiguration.java | 1 +
src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.java | 2 +-
src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java | 4 ++--
src/main/java/org/springblade/modules/jurisdiction/service/JurisdictionService.java | 4 +---
src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml | 3 ---
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 10 +++++-----
src/main/java/org/springblade/modules/system/controller/UserController.java | 10 +++++-----
src/main/java/org/springblade/modules/jurisdiction/service/impl/JurisdictionServiceImpl.java | 7 ++-----
8 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/src/main/java/org/springblade/common/config/BladeConfiguration.java b/src/main/java/org/springblade/common/config/BladeConfiguration.java
index fa85e54..97ac52d 100644
--- a/src/main/java/org/springblade/common/config/BladeConfiguration.java
+++ b/src/main/java/org/springblade/common/config/BladeConfiguration.java
@@ -108,6 +108,7 @@
secureRegistry.excludePathPatterns("/trar/**");
secureRegistry.excludePathPatterns("/integral/**");
secureRegistry.excludePathPatterns("/organ/**");
+ secureRegistry.excludePathPatterns("/rotation/**");
secureRegistry.excludePathPatterns("/policy/**");
secureRegistry.excludePathPatterns("/vote/vote/**");
secureRegistry.excludePathPatterns("/useroption/useroption/**");
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 fc3546c..3ca1251 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -56,7 +56,7 @@
LIKE CONCAT ('%', #{article.keyword},'%')
</if>
and iswords = "1"
- order by create_time desc
+ order by id desc
</select>
<!--查询资讯分页列表信息-->
@@ -97,7 +97,7 @@
AND publish = 1
</if>
and iswords = "0"
- order by create_time desc
+ order by id desc
</select>
<!--查询资讯分页列表信息-->
@@ -161,7 +161,7 @@
AND publish = 1
</if>
and iswords = "0"
- order by create_time desc
+ order by id desc
</select>
<!--查询资讯分页列表信息-->
@@ -226,7 +226,7 @@
AND publish = 1
</if>
and iswords = "0"
- order by create_time desc
+ order by id desc
</select>
<update id="upcomment">
@@ -261,6 +261,6 @@
AND publish = 1
</if>
and iswords = "0" and type!=1
- order by create_time desc
+ order by id desc
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java b/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
index f83df38..1972210 100644
--- a/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
+++ b/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
@@ -125,8 +125,8 @@
@GetMapping("/lazy-team")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
- public R<List<JurisdictionVO>> lazyTeam(String tenantId, Long parentId, BladeUser bladeUser) {
- List<JurisdictionVO> tree = jurisdictionService.lazyTeam(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
+ public R<List<JurisdictionVO>> lazyTeam() {
+ List<JurisdictionVO> tree = jurisdictionService.lazyTeam();
return R.data(tree);
}
diff --git a/src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.java b/src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.java
index 0158c06..42a4981 100644
--- a/src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.java
+++ b/src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.java
@@ -56,7 +56,7 @@
* @return
*/
List<JurisdictionVO> lazyTree(String tenantId, Long parentId);
- List<JurisdictionVO> lazyTeam(String tenantId, Long parentId);
+ List<JurisdictionVO> lazyTeam();
/**
* 懒加载获取树形节点
diff --git a/src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml b/src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml
index 469ab98..7f25ef1 100644
--- a/src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml
+++ b/src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml
@@ -114,9 +114,6 @@
SELECT id,police as parent_id,name as dept_name,is_deleted FROM sys_team
) dept
WHERE dept.is_deleted = 0
- <if test="param1!=null and param1!=''">
- and dept.tenant_id = #{param1}
- </if>
</select>
<select id="lazyTrees" resultMap="treeNodeResultMap">
diff --git a/src/main/java/org/springblade/modules/jurisdiction/service/JurisdictionService.java b/src/main/java/org/springblade/modules/jurisdiction/service/JurisdictionService.java
index f6d0d16..f02df25 100644
--- a/src/main/java/org/springblade/modules/jurisdiction/service/JurisdictionService.java
+++ b/src/main/java/org/springblade/modules/jurisdiction/service/JurisdictionService.java
@@ -59,11 +59,9 @@
/**
* 懒加载树形结构
*
- * @param tenantId
- * @param parentId
* @return
*/
- List<JurisdictionVO> lazyTeam(String tenantId, Long parentId);
+ List<JurisdictionVO> lazyTeam();
List<Map> listJur();
/**
diff --git a/src/main/java/org/springblade/modules/jurisdiction/service/impl/JurisdictionServiceImpl.java b/src/main/java/org/springblade/modules/jurisdiction/service/impl/JurisdictionServiceImpl.java
index 533fbff..b01637e 100644
--- a/src/main/java/org/springblade/modules/jurisdiction/service/impl/JurisdictionServiceImpl.java
+++ b/src/main/java/org/springblade/modules/jurisdiction/service/impl/JurisdictionServiceImpl.java
@@ -76,11 +76,8 @@
return ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, parentId));
}
@Override
- public List<JurisdictionVO> lazyTeam(String tenantId, Long parentId) {
- if (AuthUtil.isAdministrator()) {
- tenantId = StringPool.EMPTY;
- }
- return ForestNodeMerger.merge(baseMapper.lazyTeam(tenantId, parentId));
+ public List<JurisdictionVO> lazyTeam() {
+ return ForestNodeMerger.merge(baseMapper.lazyTeam());
}
@Override
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 874f79f..3c41a72 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -502,11 +502,11 @@
User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")), User.class);
//数据脱敏处理
- user.setAccount(user.getRealName().substring(0,1)+user.getCardid().substring(user.getCardid().length()-4));
- user.setCardid(DesensitizedUtil.desensitizedIdNumber(user.getCardid()));
- user.setPhone(DesensitizedUtil.desensitizedPhoneNumber(user.getPhone()));
- user.setName(DesensitizedUtil.desensitizedName(user.getName()));
- user.setRealName(DesensitizedUtil.desensitizedName(user.getRealName()));
+// user.setAccount(user.getRealName().substring(0,1)+user.getCardid().substring(user.getCardid().length()-4));
+// user.setCardid(DesensitizedUtil.desensitizedIdNumber(user.getCardid()));
+// user.setPhone(DesensitizedUtil.desensitizedPhoneNumber(user.getPhone()));
+// user.setName(DesensitizedUtil.desensitizedName(user.getName()));
+// user.setRealName(DesensitizedUtil.desensitizedName(user.getRealName()));
Integer userCount = userService.selectCount(user.getAccount());
--
Gitblit v1.9.3