Merge remote-tracking branch 'origin/xinghong-dev'

java110

2020-12-08 498288ba58aaeaea0453424a8f9b8448582ff0df

 service-user/src/main/java/com/java110/user/bmo/rentingPool/impl/SaveRentingPoolBMOImpl.java

@@ -29,6 +29,7 @@
    @Autowired
    private IFileInnerServiceSMO fileInnerServiceSMOImpl;

    @Autowired
    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;

    /**
@@ -50,13 +51,13 @@
        if (rentingPoolDtos != null && rentingPoolDtos.size() > 0) {
            throw new IllegalArgumentException("该房屋当前为" + rentingPoolDtos.get(0).getStateName() + ",不能再次出租");
        }

        rentingPoolPo.setRentingId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_rentingId));
        if (photos.size() > 0) {
            savaRentingFile(photos, rentingPoolPo);
        }


        rentingPoolPo.setRentingId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_rentingId));

        int flag = rentingPoolInnerServiceSMOImpl.saveRentingPool(rentingPoolPo);

        if (flag > 0) {