Merge branch 'wallet_detail' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserLoginBiz.java

@@ -3,9 +3,8 @@ package com.github.wxiaoqi.security.admin.biz;
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
 import com.alibaba.fastjson.JSONObject;
-import com.github.wxiaoqi.security.admin.dto.AccountBindDTO;
 import com.github.wxiaoqi.security.admin.bo.UserBo;
-import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
+import com.github.wxiaoqi.security.admin.dto.AccountBindDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
 import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
@@ -13,9 +12,7 @@ import com.github.wxiaoqi.security.admin.mapper.AppUserLoginMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import com.github.wxiaoqi.security.common.constant.UserConstant;
-import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.xxfc.platform.im.utils.StringUtil;
 import com.xxfc.platform.universal.entity.IdInformation;
 import com.xxfc.platform.universal.feign.MQSenderFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
@@ -183,7 +180,7 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
 
     public AppUserLogin checkeUserLogin(String username) {
         Example example = new Example(AppUserLogin.class);
-        example.createCriteria().andEqualTo("username", username).andEqualTo("isdel", 0).andEqualTo("status", 0);
+        example.createCriteria().andEqualTo("username", username).andEqualTo("isdel", 0);
         List<AppUserLogin> userLoginList = mapper.selectByExample(example);
         if (userLoginList != null && userLoginList.size() != 0) {
             return userLoginList.get(0);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletDetailBiz.java

@@ -50,6 +50,11 @@ public class MyWalletDetailBiz extends BaseBiz<MyWalletDetailMapper, MyWalletDet
      PageDataVO<MyWalletDetail> walletDetailPageVoPageDataVO = PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.selectByExample(example));
      List<MyWalletDetail> walletDetails = walletDetailPageVoPageDataVO.getData();
      if (CollectionUtils.isEmpty(walletDetails)){
+          walletDetailPageVo.setPageNum(pageNo);
+          walletDetailPageVo.setPageSize(pageSize);
+          walletDetailPageVo.setData(Collections.EMPTY_LIST);
+          walletDetailPageVo.setTotalPage(0);
+          walletDetailPageVo.setTotalCount(0L);
          return walletDetailPageVo;
      }
      List<WalletDetailPageVo> walletDetailPageVoList = new ArrayList<>();