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) {