diff --git a/pom.xml b/pom.xml index 97e0c7670..83af8f9eb 100644 --- a/pom.xml +++ b/pom.xml @@ -254,20 +254,20 @@ - - dev + local - dev + local true + - local + dev - local + dev diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java index be3f4791f..57ea4af0b 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java @@ -144,15 +144,15 @@ public class SysWxUserInfoController extends BaseController { } @GetMapping("/wx/user/list") - public AjaxResult userList(SysWxUserInfo sysWxUserInfo) { + public TableDataInfo userList(SysWxUserInfo sysWxUserInfo) { startPage(); - List list = sysWxUserInfoService.selectSysWxUserInfoList(sysWxUserInfo); + List list = sysWxUserInfoService.selectSysWxUserInfoListNot(sysWxUserInfo); for (SysWxUserInfo userInfo : list) { if (StringUtils.isNotEmpty(userInfo.getPhone())) { userInfo.setPhone(userInfo.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")); } } - return AjaxResult.success(list); + return getDataTable(list); } } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java index e2672e4e3..5173878a0 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java @@ -27,6 +27,8 @@ public interface SysWxUserInfoMapper */ public List selectSysWxUserInfoList(SysWxUserInfo sysWxUserInfo); + public List selectSysWxUserInfoListNot(SysWxUserInfo sysWxUserInfo); + /** * 新增微信用户 * diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java index 06f905cce..45dd721fe 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java @@ -27,6 +27,8 @@ public interface ISysWxUserInfoService */ public List selectSysWxUserInfoList(SysWxUserInfo sysWxUserInfo); + public List selectSysWxUserInfoListNot(SysWxUserInfo sysWxUserInfo); + /** * 新增微信用户 * diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java index f86f47d70..a1ccb0e84 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java @@ -44,6 +44,11 @@ public class SysWxUserInfoServiceImpl implements ISysWxUserInfoService return sysWxUserInfoMapper.selectSysWxUserInfoList(sysWxUserInfo); } + @Override + public List selectSysWxUserInfoListNot(SysWxUserInfo sysWxUserInfo) { + return sysWxUserInfoMapper.selectSysWxUserInfoListNot(sysWxUserInfo); + } + /** * 新增微信用户 * diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml index a3331fcc0..0d594c189 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml @@ -35,6 +35,17 @@ + +