From 21ed3e7c87b799b46139a2be4f25b2863cb585c3 Mon Sep 17 00:00:00 2001 From: yujintao Date: Fri, 25 Oct 2019 10:17:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml | 2 +- .../epdc-admin-server/src/main/resources/mapper/SysUserDao.xml | 1 + .../com/elink/esua/epdc/service/impl/AppUserServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml index 291295f77..f3ed6ebbe 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml @@ -99,7 +99,7 @@ com.id communityId, gri.`name` grid, gri.id gridId, - gri.created_time switchedTime + gri.create_date switchedTime FROM sys_dept gri LEFT JOIN sys_dept com ON gri.pid = com.id diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml index 56eb388a6..bd6e9f3dc 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml @@ -72,6 +72,7 @@ d.type_key = 'grid_party' AND r.type_key = 'gridLeader' AND u.mobile = #{mobile} + AND u.del_flag = 0 ORDER BY d.create_date DESC diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 7f9bd32ed..c4a9beca2 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -282,7 +282,7 @@ public class AppUserServiceImpl implements AppUserService { appUser.setRealName(sysUser.getRealName()); appUser.setEmail(sysUser.getEmail()); appUser.setPartyFlag(YesOrNoEnum.NO.value()); - appUser.setLeaderFlag(YesOrNoEnum.NO.value()); + appUser.setLeaderFlag(YesOrNoEnum.YES.value()); PhoneDto phoneDto = PhoneUtil.getPhoneDto(mobile); if (phoneDto != null) {