From d2363835e4155f22802489d11729a77b58fc69ba Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 26 Aug 2020 16:47:53 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=B0=83=E6=95=B4=20?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=B3=A8=E5=86=8C=E4=BF=A1=E6=81=AF=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=94=B6=E9=9B=86=E9=AA=8C=E8=AF=81=E7=A0=81=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
index aa999da0f6..0f2a2ab82d 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
@@ -82,7 +82,7 @@ public class InfoSubmitFromDTO implements Serializable {
 	/**
 	 * 手机验证码
 	 */
-	@NotBlank(message = "手机验证码不能为空")
+	//@NotBlank(message = "手机验证码不能为空")
 	@Length(max=6,message = "手机验证码不能超过6位")
 	private String mobileCode;
 

From a0ca579690e38ce648ae0c0f4652733c1539357d Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 26 Aug 2020 18:15:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
index 0f2a2ab82d..aa999da0f6 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
@@ -82,7 +82,7 @@ public class InfoSubmitFromDTO implements Serializable {
 	/**
 	 * 手机验证码
 	 */
-	//@NotBlank(message = "手机验证码不能为空")
+	@NotBlank(message = "手机验证码不能为空")
 	@Length(max=6,message = "手机验证码不能超过6位")
 	private String mobileCode;
 

From f34031f358dd6de81af0bdb225959129a61e09ac Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 14 Sep 2020 09:35:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/GovStaffRoleDao.xml  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
index a9da37f9d9..d3223ab0db 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
@@ -72,18 +72,20 @@
     <!-- 查询用户的权限 -->
     <select id="getRoleInfoList" resultType="com.epmet.dto.result.RoleResultDTO">
         SELECT
-            gsr.role_key AS roleKey,
-            gsr.role_name AS roleName,
-            sr.staff_id AS userId
+        gsr.role_key AS roleKey,
+        gsr.role_name AS roleName,
+        sr.staff_id AS userId
         FROM
-            gov_staff_role gsr
-            LEFT JOIN staff_role sr ON sr.role_id = gsr.id
+        gov_staff_role gsr
+        LEFT JOIN staff_role sr ON sr.role_id = gsr.id
         WHERE
-            gsr.del_flag = 0
-            AND sr.del_flag = 0
-            AND
+        gsr.del_flag = 0
+        AND sr.del_flag = 0
+        AND
+        (
             <foreach collection="userIds" item="userId" separator="OR">
                 sr.staff_id = #{userId}
             </foreach>
+        )
     </select>
 </mapper>
\ No newline at end of file