经销商管理

doum

6 小时以前 b05fea19990632b2ec6320cbfaab2bddc87006c0

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java

@@ -90,7 +90,7 @@
                info = info.replace("${param"+(i+1)+"}",params[i]);
            }
        }
       UserAction userAction=new UserAction();
        UserAction userAction=new UserAction();
        userAction.setIsdeleted(Constants.ZERO);
        userAction.setCreateDate(date);
        userAction.setCreator(user.getId());
@@ -113,34 +113,33 @@
        QueryWrapper<UserAction> wrapper = new QueryWrapper<>(userAction);
        return userActionMapper.selectOne(wrapper);
    }

    @Override
    public List<UserAction> findList(UserAction userAction) {
        QueryWrapper<UserAction> wrapper = new QueryWrapper<>(userAction);
        return userActionMapper.selectList(wrapper);
    }
  
    @Override
    public PageData<UserAction> findPage(PageWrap<UserAction> pageWrap) {
        IPage<UserAction> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<UserAction> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
       UserAction queryModel =  pageWrap.getModel();
        UserAction queryModel =  pageWrap.getModel();
        queryWrapper.selectAll(UserAction.class)
                .leftJoin(Member.class,Member::getId,UserAction::getMemberId)
//                .leftJoin(Member.class,Member::getId,UserAction::getMemberId)
                .leftJoin(SystemUser.class,SystemUser::getId,UserAction::getCreator)
                .selectAs(SystemUser::getRealname,UserAction::getCreateName)
                .selectAs(Member::getName,UserAction::getMemberName)
                .selectAs(Member::getPhone,UserAction::getMobile)
//                .selectAs(Member::getName,UserAction::getMemberName)
//                .selectAs(Member::getPhone,UserAction::getMobile)
                .like(StringUtils.isNotBlank(queryModel.getCreateName()),SystemUser::getRealname,queryModel.getCreateName())
                .like(StringUtils.isNotBlank(queryModel.getMemberName()),Member::getName,queryModel.getMemberName())
                .like(StringUtils.isNotBlank(queryModel.getMobile()),Member::getPhone,queryModel.getMobile())
                .like(StringUtils.isNotBlank(queryModel.getRemark()),Member::getPhone,queryModel.getRemark())
                .eq(!Objects.isNull(queryModel.getMemberType()),Member::getType,queryModel.getMemberType())
                .eq(!Objects.isNull(queryModel.getBeforeStatus()),UserAction::getBeforeStatus,queryModel.getBeforeStatus())
                .eq(!Objects.isNull(queryModel.getMemberId()),UserAction::getMemberId,queryModel.getMemberId())
                .eq(!Objects.isNull(queryModel.getType()),UserAction::getType,queryModel.getType())
                .orderByDesc(UserAction::getCreateDate)
        ;
                .eq(!Objects.isNull(queryModel.getId()),UserAction::getId,queryModel.getId())
                .orderByDesc(UserAction::getCreateDate);
        IPage<UserAction> result =  userActionMapper.selectJoinPage(page,UserAction.class,queryWrapper);
        if(result!=null &&result.getRecords()!=null){
            for(UserAction model :result.getRecords()){