From 6b052be0122ab8df9a48752ab2adfa1b35a48ea9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 02 Dec 2021 15:44:12 +0800
Subject: [PATCH] 检查，指令修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 7 ++++++-
src/main/java/org/springblade/modules/social/vo/SocialVO.java | 2 ++
src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml | 2 +-
src/main/java/org/springblade/modules/coinspect/entity/Coinspect.java | 2 +-
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 2 +-
src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml | 2 +-
src/main/java/org/springblade/modules/directive/controller/DirectiveController.java | 2 +-
7 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/coinspect/entity/Coinspect.java b/src/main/java/org/springblade/modules/coinspect/entity/Coinspect.java
index ccbed81..3954abf 100644
--- a/src/main/java/org/springblade/modules/coinspect/entity/Coinspect.java
+++ b/src/main/java/org/springblade/modules/coinspect/entity/Coinspect.java
@@ -66,7 +66,7 @@
*/
@ApiModelProperty(value = "检查日期")
@TableField("reviewTime")
- private String reviewtime;
+ private Date reviewtime;
/**
* 检查内容
*/
diff --git a/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml b/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml
index 22cf648..b740563 100644
--- a/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml
+++ b/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml
@@ -16,7 +16,7 @@
<select id="selectCoinspectPage" resultMap="coinspectResultMap">
- select * from sys_coinspect where is_deleted = 0
+ select * from sys_coinspect
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java b/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
index 2cbd28e..42739de 100644
--- a/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
+++ b/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
@@ -87,7 +87,7 @@
DirectiveFile directiveFile = new DirectiveFile();
directiveFile.setType(1);
directiveFile.setDirectiveId(directive.getId());
- directiveFile.setUrl(urls);
+ directiveFile.setUrl(url);
status = directiveService.saveDirectiveFile(directiveFile);
String s2 =
"insert into sys_directive_file(id,type,directive_id,url) " +
diff --git a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
index e4ed5a5..40c7857 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -425,7 +425,7 @@
List<MultipartFile> fileList = new ArrayList<>();
//获取图片文件
- fileList = fileUtil.getSubFiles(desPath+File.separator+namePath,fileList);
+ fileList = fileUtil.getSubFiles(desPath,fileList);
for (MultipartFile multipartFile : fileList){
if(multipartFile.getName().toLowerCase().endsWith(".png") || multipartFile.getName().toLowerCase().endsWith(".jpg")) {
String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "") + multipartFile.getName().substring(multipartFile.getName().lastIndexOf("."));
diff --git a/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml b/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml
index b7a4897..c44016f 100644
--- a/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml
+++ b/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml
@@ -23,8 +23,8 @@
<select id="selectSocialPage" resultMap="socialResultMap">
SELECT
+ distinct u.id sid,
s.*,
- distinct u.id,
u.real_name as realname
FROM
blade_user u
diff --git a/src/main/java/org/springblade/modules/social/vo/SocialVO.java b/src/main/java/org/springblade/modules/social/vo/SocialVO.java
index 58511dd..10dba7c 100644
--- a/src/main/java/org/springblade/modules/social/vo/SocialVO.java
+++ b/src/main/java/org/springblade/modules/social/vo/SocialVO.java
@@ -34,4 +34,6 @@
private static final long serialVersionUID = 1L;
private String realname;
+ private Long sid;
+
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 79a047b..361bfa5 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -119,7 +119,10 @@
<if test="user.cardid!=null and user.cardid != ''">
and bu.cardid like concat('%', #{user.cardid},'%')
</if>
- <if test="user.examinationType!=null and user.examinationType != ''">
+ <if test="user.examinationType==0">
+ and (bu.examination_type = #{user.examinationType} or bu.examination_type is null or bu.examination_type="")
+ </if>
+ <if test="user.examinationType==1">
and bu.examination_type = #{user.examinationType}
</if>
ORDER BY bu.id
@@ -195,6 +198,8 @@
SELECT id, name, real_name RealName
FROM blade_user
where cardid = #{param1}
+ and is_deleted = 0
+ and status = 1
</select>
--
Gitblit v1.9.3