Commit 623c9701a0c2d7bd1a0fbcadb2076838e13d345c

Authored by qdlgxiemaosheng
1 parent a001f0e8

feat:用户删除、离职操作

src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
@@ -163,7 +163,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser @@ -163,7 +163,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
163 */ 163 */
164 private LambdaQueryWrapper<AdminUserDO> buildQueryByParam(AdminUserQueryVO queryVO) { 164 private LambdaQueryWrapper<AdminUserDO> buildQueryByParam(AdminUserQueryVO queryVO) {
165 return new LambdaQueryWrapper<AdminUserDO>() 165 return new LambdaQueryWrapper<AdminUserDO>()
166 - .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) 166 + .in(BaseDO::getEnableFlag, Arrays.asList(Constant.ENABLE_TEN, Constant.THIRTY))
167 .eq(StringUtils.isNotBlank(queryVO.getUserName()), AdminUserDO::getUserName, queryVO.getUserName()) 167 .eq(StringUtils.isNotBlank(queryVO.getUserName()), AdminUserDO::getUserName, queryVO.getUserName())
168 .eq(StringUtils.isNotBlank(queryVO.getNickName()), AdminUserDO::getNickName, queryVO.getNickName()) 168 .eq(StringUtils.isNotBlank(queryVO.getNickName()), AdminUserDO::getNickName, queryVO.getNickName())
169 .eq(StringUtils.isNotBlank(queryVO.getPhone()), AdminUserDO::getPhone, queryVO.getPhone()) 169 .eq(StringUtils.isNotBlank(queryVO.getPhone()), AdminUserDO::getPhone, queryVO.getPhone())