From bb8a900d64677347c71a14b3bdf7110e1d7fcef8 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 08 十一月 2022 16:55:43 +0800
Subject: [PATCH] bug修改
---
ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml | 1 +
ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml | 8 +++++---
ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java | 2 +-
ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java | 4 ++--
ycl-common/src/main/java/com/ycl/vo/user/UserVO.java | 2 +-
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
index dee13d0..dff07d7 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
@@ -83,7 +83,7 @@
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
- private Byte userType;
+ private Integer userType;
@ApiModelProperty(value = "搴ф満/鍒嗘満")
private String zj;
@@ -99,7 +99,7 @@
private String keyword;
@ApiModelProperty(value = "閮ㄩ棬")
@TableField(exist = false)
- private UmsDepart depart;
+ private List<UmsDepart> depart;
@ApiModelProperty(value = "瑙掕壊鍒楄〃")
@TableField(exist = false)
private List<UmsRole> roles;
diff --git a/ycl-common/src/main/java/com/ycl/vo/user/UserVO.java b/ycl-common/src/main/java/com/ycl/vo/user/UserVO.java
index f5b04a2..91c63e0 100644
--- a/ycl-common/src/main/java/com/ycl/vo/user/UserVO.java
+++ b/ycl-common/src/main/java/com/ycl/vo/user/UserVO.java
@@ -20,7 +20,7 @@
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷,0鍗充负鏌ヨ鍏ㄩ儴锛岄粯璁�0",example = "0")
- private Byte userType;
+ private Integer userType;
@ApiModelProperty(value = "鑱屽姟")
private String jobTitle;
diff --git a/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
index 737fc65..78369f0 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
@@ -10,6 +10,7 @@
<result column="icon" property="icon"/>
<result column="email" property="email"/>
<result column="nick_name" property="nickName"/>
+ <result column="sex" property="sex"/>
<result column="note" property="note"/>
<result column="create_time" property="createTime"/>
<result column="login_time" property="loginTime"/>
@@ -23,7 +24,7 @@
<result column="mobile" property="mobile"/>
</resultMap>
<resultMap type="com.ycl.entity.user.UmsAdmin" id="CondMapResultMap" extends="BaseResultMap">
- <association property="depart" javaType="com.ycl.entity.depart.UmsDepart">
+ <collection property="depart" javaType="ArrayList" ofType="com.ycl.entity.depart.UmsDepart">
<id column="depart_id" property="id"/>
<result column="depart_name" property="departName"/>
<result column="depart_des" property="departDes"/>
@@ -33,8 +34,9 @@
<result column="depart_create_time" property="createTime"/>
<result column="depart_update_time" property="updateTime"/>
<result column="is_deleted" property="isDeleted"/>
- </association>
- <collection property="roles" javaType="ArrayList" ofType="com.ycl.entity.user.UmsRole" column="id" select="selectAdminRoles">
+ </collection>
+ <collection property="roles" javaType="ArrayList" ofType="com.ycl.entity.user.UmsRole" column="id"
+ select="selectAdminRoles">
<id column="role_id" property="id"/>
<result column="name" property="name"/>
<result column="description" property="description"/>
diff --git a/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java b/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java
index 3279496..9d449bd 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java
@@ -36,7 +36,7 @@
@ApiModelProperty("鐓х墖")
private String storephoto;
- @NotBlank(message = "韬唤璇佷俊鎭笉鑳戒负绌�")
+// @NotBlank(message = "韬唤璇佷俊鎭笉鑳戒负绌�")
@ApiModelProperty("韬唤璇佷俊鎭�")
private String idcardinfo;
diff --git a/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
index dc7bb3c..1c956d7 100644
--- a/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
@@ -28,5 +28,6 @@
t1.store_name LIKE CONCAT('%', #{keyword}, '%')
</if>
</where>
+ order by t1.id desc
</select>
</mapper>
--
Gitblit v1.8.0