20220505

xiaoyong931011

2022-05-05 3b3f13a66fe018b1f0abe16db8d194b1927907aa

 zq-erp/src/main/java/com/matrix/system/padApi/action/PadServiceAction.java

@@ -29,7 +29,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections.CollectionUtils;
import org.assertj.core.util.Arrays;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -153,6 +152,9 @@
        }
        if(ObjectUtil.isNotEmpty(orderListDto.getQueryKey())){
            projService.setQueryKey(orderListDto.getQueryKey());
        }
        if(StrUtil.isNotEmpty(orderListDto.getState())){
            projService.setState(orderListDto.getState());
        }
        QueryUtil.setQueryLimitCom(projService);
        List<SysProjServices> dataList = projServicesSerivce.findInPage(projService, pageVo);
@@ -301,7 +303,9 @@
        }
        SysProjServices newSysProjServices = sysProjServicesService.addSysProjServices(sysProjServices);
        if (newSysProjServices != null) {
            return AjaxResult.buildSuccessInstance(Arrays.asList(newSysProjServices));
            AjaxResult result = AjaxResult.buildSuccessInstance("下单成功!");
            result.putInMap("newSysProjServices", newSysProjServices);
            return result;
        } else {
            return new AjaxResult(AjaxResult.STATUS_FAIL, "下单失败!");
        }