From eddbe49f2d54ba6fb0a5548fe4efe7f12c83acfa Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 25 Jan 2022 10:44:29 +0800
Subject: [PATCH] 问题修复
---
src/main/java/org/springblade/modules/organ/mapper/OrganMapper.xml | 11 +++++------
src/main/java/org/springblade/modules/organ/entity/Organ.java | 7 ++-----
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/organ/entity/Organ.java b/src/main/java/org/springblade/modules/organ/entity/Organ.java
index 1320950..21b66f7 100644
--- a/src/main/java/org/springblade/modules/organ/entity/Organ.java
+++ b/src/main/java/org/springblade/modules/organ/entity/Organ.java
@@ -45,7 +45,7 @@
* 用户id
*/
@ApiModelProperty(value = "用户id")
- private Integer uid;
+ private String uid;
/**
* 组织
*/
@@ -62,9 +62,6 @@
* 进度
*/
@ApiModelProperty(value = "进度")
- private Double
-
- speed;
-
+ private String type;
}
diff --git a/src/main/java/org/springblade/modules/organ/mapper/OrganMapper.xml b/src/main/java/org/springblade/modules/organ/mapper/OrganMapper.xml
index 6cd5a0e..0f56957 100644
--- a/src/main/java/org/springblade/modules/organ/mapper/OrganMapper.xml
+++ b/src/main/java/org/springblade/modules/organ/mapper/OrganMapper.xml
@@ -8,16 +8,15 @@
<result column="uid" property="uid"/>
<result column="organization" property="organization"/>
<result column="time" property="time"/>
- <result column="
-
-speed" property="
-
-speed"/>
+ <result column="type" property="type"/>
</resultMap>
<select id="selectOrganPage" resultMap="organResultMap">
- select * from sys_organ where is_deleted = 0
+ select * from sys_organ where 1=1
+ <if test="organ.uid != null and organ.uid != ''">
+ and uid =#{organ.uid}
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3