Merge branch 'dev' of chinawu123/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/DeviceManageService.java

@@ -145,8 +145,12 @@ public class DeviceManageService extends BaseJpaService<BaseDeviceRepairEntity,B
        BaseDoctorDO doctorDO = baseDoctorDao.findById(doctor);
        List<BaseDeviceRepairEntity> baseDeviceRepairEntities = baseDeviceRepairDao.findbydeviceSn(repairEntity.getDeviceSn());
        if (baseDeviceRepairEntities.size()>0){
            return null;
        if (baseDeviceRepairEntities.size() > 0) {
            for (BaseDeviceRepairEntity baseDeviceRepairEntity : baseDeviceRepairEntities) {
                if (baseDeviceRepairEntity.getStatus() == 0) {
                    return null;
                }
            }
        }
        if (2==doctorDO.getLevel()||4==doctorDO.getLevel()){